X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Fmain.go;h=2d72466b60e238f931c1d8209e27c23171088404;hb=2087193ca6c26335eef316f1d7cbf8ef3f232e07;hp=380087f3c495e185d6daeab9f9126b900a4cb050;hpb=6e0d5846a1f6d938605a4afa7f392d97ac2ba8bc;p=nonrtric.git

diff --git a/dmaap-mediator-producer/main.go b/dmaap-mediator-producer/main.go
index 380087f3..2d72466b 100644
--- a/dmaap-mediator-producer/main.go
+++ b/dmaap-mediator-producer/main.go
@@ -26,7 +26,6 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/hashicorp/go-retryablehttp"
 	log "github.com/sirupsen/logrus"
 	"oransc.org/nonrtric/dmaapmediatorproducer/internal/config"
 	"oransc.org/nonrtric/dmaapmediatorproducer/internal/jobs"
@@ -43,31 +42,35 @@ 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)
 
-	var retryClient restclient.HTTPClient
-	if cert, err := createClientCertificate(); err == nil {
-		retryClient = createRetryClient(cert)
+	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)
 	}
+	retryClient := restclient.CreateRetryClient(cert)
 
-	jobsManager := jobs.NewJobsManagerImpl("configs/type_config.json", retryClient, configuration.DMaaPMRAddress, &http.Client{
-		Timeout: time.Second * 5,
-	})
+	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)
 	}
-	jobsManager.StartJobs()
+	jobsManager.StartJobsForAllTypes()
 
 	log.Debug("Starting DMaaP Mediator Producer")
 	go func() {
 		log.Debugf("Starting callback server at port %v", configuration.InfoProducerPort)
 		r := server.NewRouter(jobsManager)
-		log.Fatalf("Server stopped: %v", http.ListenAndServeTLS(fmt.Sprintf(":%v", configuration.InfoProducerPort), configuration.ProducerCertPath, configuration.ProducerKeyPath, r))
+		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()
@@ -82,43 +85,20 @@ func validateConfiguration(configuration *config.Config) error {
 	}
 	return nil
 }
-
-func createClientCertificate() (*tls.Certificate, error) {
-	if cert, err := tls.LoadX509KeyPair(configuration.ProducerCertPath, configuration.ProducerKeyPath); err == nil {
-		return &cert, nil
-	} else {
-		return nil, fmt.Errorf("cannot create x509 keypair from cert file %s and key file %s due to: %v", configuration.ProducerCertPath, configuration.ProducerKeyPath, err)
+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")
+	if err != nil {
+		return fmt.Errorf("unable to register all types due to: %v", err)
 	}
-}
-
-func createRetryClient(cert *tls.Certificate) *http.Client {
-	rawRetryClient := retryablehttp.NewClient()
-	rawRetryClient.RetryWaitMax = time.Minute
-	rawRetryClient.RetryMax = int(^uint(0) >> 1)
-	rawRetryClient.HTTPClient.Transport = &http.Transport{
-		TLSClientConfig: &tls.Config{
-			Certificates: []tls.Certificate{
-				*cert,
-			},
-			InsecureSkipVerify: true,
-		},
+	regErr := registrator.RegisterTypes(jobTypesHandler.LoadTypesFromConfiguration(configTypes))
+	if regErr != nil {
+		return fmt.Errorf("unable to register all types due to: %v", regErr)
 	}
 
-	return rawRetryClient.StandardClient()
-}
-
-func registerTypesAndProducer(jobHandler jobs.JobTypesManager, infoCoordinatorAddress string, callbackAddress string, client restclient.HTTPClient) error {
-	registrator := config.NewRegistratorImpl(infoCoordinatorAddress, client)
-	if types, err := jobHandler.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)
-	}
 	producer := config.ProducerRegistrationInfo{
 		InfoProducerSupervisionCallbackUrl: callbackAddress + server.StatusPath,
-		SupportedInfoTypes:                 jobHandler.GetSupportedTypes(),
+		SupportedInfoTypes:                 jobTypesHandler.GetSupportedTypes(),
 		InfoJobCallbackUrl:                 callbackAddress + server.AddJobPath,
 	}
 	if err := registrator.RegisterProducer("DMaaP_Mediator_Producer", &producer); err != nil {