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

diff --git a/dmaap-mediator-producer/main.go b/dmaap-mediator-producer/main.go
index b357f696..beeb995d 100644
--- a/dmaap-mediator-producer/main.go
+++ b/dmaap-mediator-producer/main.go
@@ -23,61 +23,92 @@ package main
 import (
 	"fmt"
 	"net/http"
+	"sync"
+	"time"
 
 	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/restclient"
 	"oransc.org/nonrtric/dmaapmediatorproducer/internal/server"
 )
 
+const timeoutHTTPClient = time.Second * 5
+const timeoutPollClient = time.Second * 15
+
 var configuration *config.Config
-var supervisionCallbackAddress string
-var jobInfoCallbackAddress string
+var httpClient restclient.HTTPClient
+var jobHandler *jobs.JobHandlerImpl
 
 func init() {
 	configuration = config.New()
-	if loglevel, err := log.ParseLevel(configuration.LogLevel); err == nil {
-		log.SetLevel(loglevel)
-	} else {
-		log.Warnf("Invalid log level: %v. Log level will be Info!", configuration.LogLevel)
-	}
+}
 
+func main() {
+	log.SetLevel(configuration.LogLevel)
 	log.Debug("Initializing DMaaP Mediator Producer")
-	if configuration.InfoProducerSupervisionCallbackHost == "" {
-		log.Fatal("Missing INFO_PRODUCER_SUPERVISION_CALLBACK_HOST")
+	if err := validateConfiguration(configuration); err != nil {
+		log.Fatalf("Stopping producer due to error: %v", err)
 	}
-	supervisionCallbackAddress = fmt.Sprintf("%v:%v", configuration.InfoProducerSupervisionCallbackHost, configuration.InfoProducerSupervisionCallbackPort)
+	callbackAddress := fmt.Sprintf("%v:%v", configuration.InfoProducerHost, configuration.InfoProducerPort)
 
-	if configuration.InfoJobCallbackHost == "" {
-		log.Fatal("Missing INFO_JOB_CALLBACK_HOST")
+	httpClient = &http.Client{
+		Timeout: timeoutHTTPClient,
+	}
+	pollClient := &http.Client{
+		Timeout: timeoutPollClient,
+	}
+	jobHandler = jobs.NewJobHandlerImpl("configs/type_config.json", pollClient, httpClient)
+	if err := registerTypesAndProducer(jobHandler, configuration.InfoCoordinatorAddress, callbackAddress); err != nil {
+		log.Fatalf("Stopping producer due to: %v", err)
 	}
-	jobInfoCallbackAddress = fmt.Sprintf("%v:%v", configuration.InfoJobCallbackHost, configuration.InfoJobCallbackPort)
 
-	registrator := config.NewRegistratorImpl(configuration.InfoCoordinatorAddress)
-	if types, err := jobtypes.GetTypes(); err == nil {
+	log.Debug("Starting DMaaP Mediator Producer")
+	wg := new(sync.WaitGroup)
+
+	// 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(jobHandler)
+		log.Warn(http.ListenAndServe(fmt.Sprintf(":%v", configuration.InfoProducerPort), r))
+		wg.Done()
+	}()
+
+	go func() {
+		jobHandler.RunJobs(fmt.Sprintf("%v:%v", configuration.MRHost, configuration.MRPort))
+		wg.Done()
+	}()
+
+	// wait until WaitGroup is done
+	wg.Wait()
+	log.Debug("Stopping DMaaP Mediator Producer")
+}
+
+func validateConfiguration(configuration *config.Config) error {
+	if configuration.InfoProducerHost == "" {
+		return fmt.Errorf("missing INFO_PRODUCER_HOST")
+	}
+	return nil
+}
+
+func registerTypesAndProducer(jobHandler jobs.JobTypeHandler, infoCoordinatorAddress string, callbackAddress string) error {
+	registrator := config.NewRegistratorImpl(infoCoordinatorAddress, httpClient)
+	if types, err := jobHandler.GetTypes(); err == nil {
 		if regErr := registrator.RegisterTypes(types); regErr != nil {
-			log.Fatalf("Unable to register all types due to: %v", regErr)
+			return fmt.Errorf("unable to register all types due to: %v", regErr)
 		}
 	} else {
-		log.Fatalf("Unable to get types to register due to: %v", err)
+		return fmt.Errorf("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:                 jobHandler.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)
-	}
-}
-
-func main() {
-	log.Debug("Starting DMaaP Mediator Producer")
-	log.Debugf("Starting status callback server at port %v", configuration.InfoProducerSupervisionCallbackPort)
-	http.HandleFunc("/", server.StatusHandler)
-
-	if err := http.ListenAndServe(":"+configuration.InfoProducerSupervisionCallbackPort, nil); err != nil {
-		log.Fatal(err)
+		return fmt.Errorf("unable to register producer due to: %v", err)
 	}
-	log.Debug("Stopping DMaaP Mediator Producer")
+	return nil
 }