X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Fmain.go;h=1aabddaaa879880bbe14d0cecd3e00e48b49b7bb;hb=ba93486b43fb1cda492ba27ae4637a6e0160ae66;hp=74f4edfbe90b1a74859c2a6f72941d410188372f;hpb=6f48adb69090799c74c29204dd2cd1737cc9d6ac;p=nonrtric.git

diff --git a/dmaap-mediator-producer/main.go b/dmaap-mediator-producer/main.go
index 74f4edfb..1aabddaa 100644
--- a/dmaap-mediator-producer/main.go
+++ b/dmaap-mediator-producer/main.go
@@ -34,6 +34,7 @@ import (
 )
 
 var configuration *config.Config
+var registered bool
 
 func init() {
 	configuration = config.New()
@@ -56,22 +57,16 @@ func main() {
 	}
 	retryClient := restclient.CreateRetryClient(cert)
 
-	jobsManager := jobs.NewJobsManagerImpl("configs/type_config.json", retryClient, configuration.DMaaPMRAddress, restclient.CreateClientWithoutRetry(cert, 5*time.Second))
+	jobsManager := jobs.NewJobsManagerImpl(retryClient, configuration.DMaaPMRAddress, restclient.CreateClientWithoutRetry(cert, 10*time.Second))
+	go startCallbackServer(jobsManager, callbackAddress)
+
 	if err := registerTypesAndProducer(jobsManager, configuration.InfoCoordinatorAddress, callbackAddress, retryClient); err != nil {
 		log.Fatalf("Stopping producer due to: %v", err)
 	}
-	jobsManager.StartJobs()
+	registered = true
+	jobsManager.StartJobsForAllTypes()
 
 	log.Debug("Starting DMaaP Mediator Producer")
-	go func() {
-		log.Debugf("Starting callback server at port %v", configuration.InfoProducerPort)
-		r := server.NewRouter(jobsManager)
-		if restclient.IsUrlSecure(callbackAddress) {
-			log.Fatalf("Server stopped: %v", http.ListenAndServeTLS(fmt.Sprintf(":%v", configuration.InfoProducerPort), configuration.ProducerCertPath, configuration.ProducerKeyPath, r))
-		} else {
-			log.Fatalf("Server stopped: %v", http.ListenAndServe(fmt.Sprintf(":%v", configuration.InfoProducerPort), r))
-		}
-	}()
 
 	keepProducerAlive()
 }
@@ -87,15 +82,17 @@ func validateConfiguration(configuration *config.Config) error {
 }
 func registerTypesAndProducer(jobTypesHandler jobs.JobTypesManager, infoCoordinatorAddress string, callbackAddress string, client restclient.HTTPClient) error {
 	registrator := config.NewRegistratorImpl(infoCoordinatorAddress, client)
-	if types, err := jobTypesHandler.LoadTypesFromConfiguration(); err == nil {
-		if regErr := registrator.RegisterTypes(types); regErr != nil {
-			return fmt.Errorf("unable to register all types due to: %v", regErr)
-		}
-	} else {
-		return fmt.Errorf("unable to get types to register due to: %v", err)
+	configTypes, err := config.GetJobTypesFromConfiguration("configs/type_config.json")
+	if err != nil {
+		return fmt.Errorf("unable to register all types due to: %v", err)
+	}
+	regErr := registrator.RegisterTypes(jobTypesHandler.LoadTypesFromConfiguration(configTypes))
+	if regErr != nil {
+		return fmt.Errorf("unable to register all types due to: %v", regErr)
 	}
+
 	producer := config.ProducerRegistrationInfo{
-		InfoProducerSupervisionCallbackUrl: callbackAddress + server.StatusPath,
+		InfoProducerSupervisionCallbackUrl: callbackAddress + server.HealthCheckPath,
 		SupportedInfoTypes:                 jobTypesHandler.GetSupportedTypes(),
 		InfoJobCallbackUrl:                 callbackAddress + server.AddJobPath,
 	}
@@ -105,6 +102,24 @@ func registerTypesAndProducer(jobTypesHandler jobs.JobTypesManager, infoCoordina
 	return nil
 }
 
+func startCallbackServer(jobsManager jobs.JobsManager, callbackAddress string) {
+	log.Debugf("Starting callback server at port %v", configuration.InfoProducerPort)
+	r := server.NewRouter(jobsManager, statusHandler)
+	if restclient.IsUrlSecure(callbackAddress) {
+		log.Fatalf("Server stopped: %v", http.ListenAndServeTLS(fmt.Sprintf(":%v", configuration.InfoProducerPort), configuration.ProducerCertPath, configuration.ProducerKeyPath, r))
+	} else {
+		log.Fatalf("Server stopped: %v", http.ListenAndServe(fmt.Sprintf(":%v", configuration.InfoProducerPort), r))
+	}
+}
+
+func statusHandler(w http.ResponseWriter, r *http.Request) {
+	registeredStatus := "not registered"
+	if registered {
+		registeredStatus = "registered"
+	}
+	fmt.Fprintf(w, `{"status": "%v"}`, registeredStatus)
+}
+
 func keepProducerAlive() {
 	forever := make(chan int)
 	<-forever