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=beeb995d9c0b329ef1d057f864ffd6e442a5256a;hpb=f1cee0f81c6bc482f73182c8f4c903e8376381e8;p=nonrtric.git

diff --git a/dmaap-mediator-producer/main.go b/dmaap-mediator-producer/main.go
index beeb995d..819ffa9d 100644
--- a/dmaap-mediator-producer/main.go
+++ b/dmaap-mediator-producer/main.go
@@ -21,24 +21,21 @@
 package main
 
 import (
+	"crypto/tls"
 	"fmt"
 	"net/http"
-	"sync"
 	"time"
 
 	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"
 )
 
-const timeoutHTTPClient = time.Second * 5
-const timeoutPollClient = time.Second * 15
-
 var configuration *config.Config
-var httpClient restclient.HTTPClient
-var jobHandler *jobs.JobHandlerImpl
+var registered bool
 
 func init() {
 	configuration = config.New()
@@ -47,64 +44,63 @@ func init() {
 func main() {
 	log.SetLevel(configuration.LogLevel)
 	log.Debug("Initializing DMaaP Mediator Producer")
+	log.Debug("Using configuration: ", configuration)
 	if err := validateConfiguration(configuration); err != nil {
 		log.Fatalf("Stopping producer due to error: %v", err)
 	}
 	callbackAddress := fmt.Sprintf("%v:%v", configuration.InfoProducerHost, configuration.InfoProducerPort)
 
-	httpClient = &http.Client{
-		Timeout: timeoutHTTPClient,
-	}
-	pollClient := &http.Client{
-		Timeout: timeoutPollClient,
+	var cert tls.Certificate
+	if c, err := restclient.CreateClientCertificate(configuration.ProducerCertPath, configuration.ProducerKeyPath); err == nil {
+		cert = c
+	} else {
+		log.Fatalf("Stopping producer due to error: %v", err)
 	}
-	jobHandler = jobs.NewJobHandlerImpl("configs/type_config.json", pollClient, httpClient)
-	if err := registerTypesAndProducer(jobHandler, configuration.InfoCoordinatorAddress, callbackAddress); err != nil {
+
+	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)
+
+	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")
-	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")
+	keepProducerAlive()
 }
 
 func validateConfiguration(configuration *config.Config) error {
 	if configuration.InfoProducerHost == "" {
 		return fmt.Errorf("missing INFO_PRODUCER_HOST")
 	}
+	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(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 {
-			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)
+func registerTypesAndProducer(jobTypesHandler jobs.JobTypesManager, infoCoordinatorAddress string, callbackAddress string, client restclient.HTTPClient) error {
+	registrator := config.NewRegistratorImpl(infoCoordinatorAddress, client)
+	configTypes, err := config.GetJobTypesFromConfiguration("configs")
+	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,
-		SupportedInfoTypes:                 jobHandler.GetSupportedTypes(),
+		InfoProducerSupervisionCallbackUrl: callbackAddress + server.HealthCheckPath,
+		SupportedInfoTypes:                 jobTypesHandler.GetSupportedTypes(),
 		InfoJobCallbackUrl:                 callbackAddress + server.AddJobPath,
 	}
 	if err := registrator.RegisterProducer("DMaaP_Mediator_Producer", &producer); err != nil {
@@ -112,3 +108,26 @@ func registerTypesAndProducer(jobHandler jobs.JobTypeHandler, infoCoordinatorAdd
 	}
 	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
+}