X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Fmain.go;h=2d72466b60e238f931c1d8209e27c23171088404;hb=bc5c16b1b1aa2f90e8b9f85dd7558c6be1edeea3;hp=194ed7507a122fa74ea7ea21136128cf84b4e45f;hpb=036962c60e1cfa18a689dffa1a8b92d335e6063e;p=nonrtric.git

diff --git a/dmaap-mediator-producer/main.go b/dmaap-mediator-producer/main.go
index 194ed750..2d72466b 100644
--- a/dmaap-mediator-producer/main.go
+++ b/dmaap-mediator-producer/main.go
@@ -56,7 +56,7 @@ 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))
 	if err := registerTypesAndProducer(jobsManager, configuration.InfoCoordinatorAddress, callbackAddress, retryClient); err != nil {
 		log.Fatalf("Stopping producer due to: %v", err)
 	}
@@ -87,13 +87,15 @@ 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,
 		SupportedInfoTypes:                 jobTypesHandler.GetSupportedTypes(),