Fix bug in Dockerfile of dmaap mediator

[nonrtric.git] / dmaap-mediator-producer / main.go

diff --git a/dmaap-mediator-producer/main.go b/dmaap-mediator-producer/main.go
index 240bdbd..3fe92dc 100644 (file)
--- a/dmaap-mediator-producer/main.go
+++ b/dmaap-mediator-producer/main.go
@@ -21,14 +21,18 @@
 package main
 
 import (
-       "time"
+       "fmt"
+       "sync"
 
        log "github.com/sirupsen/logrus"
        "oransc.org/nonrtric/dmaapmediatorproducer/internal/config"
-       "oransc.org/nonrtric/dmaapmediatorproducer/internal/jobtypes"
+       "oransc.org/nonrtric/dmaapmediatorproducer/internal/jobs"
+       "oransc.org/nonrtric/dmaapmediatorproducer/internal/server"
 )
 
 var configuration *config.Config
+var supervisionCallbackAddress string
+var jobInfoCallbackAddress string
 
 func init() {
        configuration = config.New()
@@ -39,21 +43,55 @@ func init() {
        }
 
        log.Debug("Initializing DMaaP Mediator Producer")
-       if configuration.JobResultUri == "" {
-               log.Fatal("Missing JOB_RESULT_URI")
+       if configuration.InfoProducerSupervisionCallbackHost == "" {
+               log.Fatal("Missing INFO_PRODUCER_SUPERVISION_CALLBACK_HOST")
        }
+       supervisionCallbackAddress = fmt.Sprintf("%v:%v", configuration.InfoProducerSupervisionCallbackHost, configuration.InfoProducerSupervisionCallbackPort)
+
+       if configuration.InfoJobCallbackHost == "" {
+               log.Fatal("Missing INFO_JOB_CALLBACK_HOST")
+       }
+       jobInfoCallbackAddress = fmt.Sprintf("%v:%v", configuration.InfoJobCallbackHost, configuration.InfoJobCallbackPort)
 
        registrator := config.NewRegistratorImpl(configuration.InfoCoordinatorAddress)
-       if types, err := jobtypes.GetTypes(); err == nil {
+       if types, err := jobs.GetTypes(); err == nil {
                if regErr := registrator.RegisterTypes(types); regErr != nil {
                        log.Fatalf("Unable to register all types due to: %v", regErr)
                }
        } else {
                log.Fatalf("Unable to get types to register due to: %v", err)
        }
+       producer := config.ProducerRegistrationInfo{
+               InfoProducerSupervisionCallbackUrl: supervisionCallbackAddress,
+               SupportedInfoTypes:                 jobs.GetSupportedTypes(),
+               InfoJobCallbackUrl:                 jobInfoCallbackAddress,
+       }
+       if err := registrator.RegisterProducer("DMaaP_Mediator_Producer", &producer); err != nil {
+               log.Fatalf("Unable to register producer due to: %v", err)
+       }
 }
 
 func main() {
        log.Debug("Starting DMaaP Mediator Producer")
-       time.Sleep(1000 * time.Millisecond)
+       wg := new(sync.WaitGroup)
+
+       // add two goroutines to `wg` WaitGroup, one for each avilable server
+       wg.Add(2)
+
+       log.Debugf("Starting status callback server at port %v", configuration.InfoProducerSupervisionCallbackPort)
+       go func() {
+               server := server.CreateServer(configuration.InfoProducerSupervisionCallbackPort, server.StatusHandler)
+               log.Warn(server.ListenAndServe())
+               wg.Done()
+       }()
+
+       go func() {
+               server := server.CreateServer(configuration.InfoJobCallbackPort, server.CreateInfoJobHandler)
+               log.Warn(server.ListenAndServe())
+               wg.Done()
+       }()
+
+       // wait until WaitGroup is done
+       wg.Wait()
+       log.Debug("Stopping DMaaP Mediator Producer")
 }