X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Fmain.go;h=15207ec713af51ab0385c96f96974c2677bf5b00;hb=refs%2Fchanges%2F24%2F6824%2F1;hp=b357f6962418fc3cce537489122fe6946a7d3cd5;hpb=ba96d847ab72a882bfe3acd39bc70c8f544f094a;p=nonrtric.git

diff --git a/dmaap-mediator-producer/main.go b/dmaap-mediator-producer/main.go
index b357f696..15207ec7 100644
--- a/dmaap-mediator-producer/main.go
+++ b/dmaap-mediator-producer/main.go
@@ -23,16 +23,16 @@ package main
 import (
 	"fmt"
 	"net/http"
+	"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
+var callbackAddress string
 
 func init() {
 	configuration = config.New()
@@ -43,18 +43,13 @@ func init() {
 	}
 
 	log.Debug("Initializing DMaaP Mediator Producer")
-	if configuration.InfoProducerSupervisionCallbackHost == "" {
+	if configuration.InfoProducerHost == "" {
 		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)
+	callbackAddress = fmt.Sprintf("%v:%v", configuration.InfoProducerHost, configuration.InfoProducerPort)
 
 	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)
 		}
@@ -62,9 +57,9 @@ func init() {
 		log.Fatalf("Unable to get types to register due to: %v", err)
 	}
 	producer := config.ProducerRegistrationInfo{
-		InfoProducerSupervisionCallbackUrl: supervisionCallbackAddress,
-		SupportedInfoTypes:                 jobtypes.GetSupportedTypes(),
-		InfoJobCallbackUrl:                 jobInfoCallbackAddress,
+		InfoProducerSupervisionCallbackUrl: callbackAddress + server.StatusPath,
+		SupportedInfoTypes:                 jobs.GetSupportedTypes(),
+		InfoJobCallbackUrl:                 callbackAddress + server.AddJobPath,
 	}
 	if err := registrator.RegisterProducer("DMaaP_Mediator_Producer", &producer); err != nil {
 		log.Fatalf("Unable to register producer due to: %v", err)
@@ -73,11 +68,24 @@ func init() {
 
 func main() {
 	log.Debug("Starting DMaaP Mediator Producer")
-	log.Debugf("Starting status callback server at port %v", configuration.InfoProducerSupervisionCallbackPort)
-	http.HandleFunc("/", server.StatusHandler)
+	wg := new(sync.WaitGroup)
 
-	if err := http.ListenAndServe(":"+configuration.InfoProducerSupervisionCallbackPort, nil); err != nil {
-		log.Fatal(err)
-	}
+	// add two goroutines to `wg` WaitGroup, one for each running go routine
+	wg.Add(2)
+
+	log.Debugf("Starting callback server at port %v", configuration.InfoProducerPort)
+	go func() {
+		r := server.NewRouter()
+		log.Warn(http.ListenAndServe(fmt.Sprintf(":%v", configuration.InfoProducerPort), r))
+		wg.Done()
+	}()
+
+	go func() {
+		jobs.RunJobs(fmt.Sprintf("%v:%v", configuration.MRHost, configuration.MRPort))
+		wg.Done()
+	}()
+
+	// wait until WaitGroup is done
+	wg.Wait()
 	log.Debug("Stopping DMaaP Mediator Producer")
 }