X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Fmain.go;h=819ffa9d811ee143a8b4b109619ccaa799646dee;hb=7eca35ab52d5139dd9e23aa5707b30eab10c5e34;hp=2d72466b60e238f931c1d8209e27c23171088404;hpb=09e21f39a3ffcfc2063110bcad028014b0056398;p=nonrtric.git

diff --git a/dmaap-mediator-producer/main.go b/dmaap-mediator-producer/main.go
index 2d72466b..819ffa9d 100644
--- a/dmaap-mediator-producer/main.go
+++ b/dmaap-mediator-producer/main.go
@@ -29,11 +29,13 @@ import (
 	log "github.com/sirupsen/logrus"
 	"oransc.org/nonrtric/dmaapmediatorproducer/internal/config"
 	"oransc.org/nonrtric/dmaapmediatorproducer/internal/jobs"
+	"oransc.org/nonrtric/dmaapmediatorproducer/internal/kafkaclient"
 	"oransc.org/nonrtric/dmaapmediatorproducer/internal/restclient"
 	"oransc.org/nonrtric/dmaapmediatorproducer/internal/server"
 )
 
 var configuration *config.Config
+var registered bool
 
 func init() {
 	configuration = config.New()
@@ -54,24 +56,21 @@ func main() {
 	} else {
 		log.Fatalf("Stopping producer due to error: %v", err)
 	}
+
 	retryClient := restclient.CreateRetryClient(cert)
+	kafkaFactory := kafkaclient.KafkaFactoryImpl{BootstrapServer: configuration.KafkaBootstrapServers}
+	distributionClient := restclient.CreateClientWithoutRetry(cert, 10*time.Second)
+
+	jobsManager := jobs.NewJobsManagerImpl(retryClient, configuration.DMaaPMRAddress, kafkaFactory, distributionClient)
+	go startCallbackServer(jobsManager, callbackAddress)
 
-	jobsManager := jobs.NewJobsManagerImpl(retryClient, configuration.DMaaPMRAddress, restclient.CreateClientWithoutRetry(cert, 10*time.Second))
 	if err := registerTypesAndProducer(jobsManager, configuration.InfoCoordinatorAddress, callbackAddress, retryClient); err != nil {
 		log.Fatalf("Stopping producer due to: %v", err)
 	}
+	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()
 }
@@ -83,11 +82,14 @@ func validateConfiguration(configuration *config.Config) error {
 	if configuration.ProducerCertPath == "" || configuration.ProducerKeyPath == "" {
 		return fmt.Errorf("missing PRODUCER_CERT and/or PRODUCER_KEY")
 	}
+	if configuration.DMaaPMRAddress == "" && configuration.KafkaBootstrapServers == "" {
+		return fmt.Errorf("at least one of DMAAP_MR_ADDR or KAFKA_BOOTSRAP_SERVERS must be provided")
+	}
 	return nil
 }
 func registerTypesAndProducer(jobTypesHandler jobs.JobTypesManager, infoCoordinatorAddress string, callbackAddress string, client restclient.HTTPClient) error {
 	registrator := config.NewRegistratorImpl(infoCoordinatorAddress, client)
-	configTypes, err := config.GetJobTypesFromConfiguration("configs/type_config.json")
+	configTypes, err := config.GetJobTypesFromConfiguration("configs")
 	if err != nil {
 		return fmt.Errorf("unable to register all types due to: %v", err)
 	}
@@ -97,7 +99,7 @@ func registerTypesAndProducer(jobTypesHandler jobs.JobTypesManager, infoCoordina
 	}
 
 	producer := config.ProducerRegistrationInfo{
-		InfoProducerSupervisionCallbackUrl: callbackAddress + server.StatusPath,
+		InfoProducerSupervisionCallbackUrl: callbackAddress + server.HealthCheckPath,
 		SupportedInfoTypes:                 jobTypesHandler.GetSupportedTypes(),
 		InfoJobCallbackUrl:                 callbackAddress + server.AddJobPath,
 	}
@@ -107,6 +109,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