X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Fmain.go;h=1a91af40463c99852a2d5999d81b713f81704257;hb=803e81a2e01d51c0de9e6f08d5285ed5df08b253;hp=beeb995d9c0b329ef1d057f864ffd6e442a5256a;hpb=121fa6b1a25f0b3acdda8122362d6880c04b0a3d;p=nonrtric.git

diff --git a/dmaap-mediator-producer/main.go b/dmaap-mediator-producer/main.go
index beeb995d..1a91af40 100644
--- a/dmaap-mediator-producer/main.go
+++ b/dmaap-mediator-producer/main.go
@@ -26,6 +26,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/hashicorp/go-retryablehttp"
 	log "github.com/sirupsen/logrus"
 	"oransc.org/nonrtric/dmaapmediatorproducer/internal/config"
 	"oransc.org/nonrtric/dmaapmediatorproducer/internal/jobs"
@@ -33,11 +34,12 @@ import (
 	"oransc.org/nonrtric/dmaapmediatorproducer/internal/server"
 )
 
-const timeoutHTTPClient = time.Second * 5
-const timeoutPollClient = time.Second * 15
+const timeoutDistributionClient = time.Second * 5
+const retryWaitMax = time.Minute
+const retryMax = int(^uint(0) >> 1)
 
 var configuration *config.Config
-var httpClient restclient.HTTPClient
+var retryClient restclient.HTTPClient
 var jobHandler *jobs.JobHandlerImpl
 
 func init() {
@@ -52,13 +54,16 @@ func main() {
 	}
 	callbackAddress := fmt.Sprintf("%v:%v", configuration.InfoProducerHost, configuration.InfoProducerPort)
 
-	httpClient = &http.Client{
-		Timeout: timeoutHTTPClient,
+	distributionClient := &http.Client{
+		Timeout: timeoutDistributionClient,
 	}
-	pollClient := &http.Client{
-		Timeout: timeoutPollClient,
-	}
-	jobHandler = jobs.NewJobHandlerImpl("configs/type_config.json", pollClient, httpClient)
+
+	rawRetryClient := retryablehttp.NewClient()
+	rawRetryClient.RetryWaitMax = retryWaitMax
+	rawRetryClient.RetryMax = retryMax
+	retryClient = rawRetryClient.StandardClient()
+
+	jobHandler = jobs.NewJobHandlerImpl("configs/type_config.json", retryClient, distributionClient)
 	if err := registerTypesAndProducer(jobHandler, configuration.InfoCoordinatorAddress, callbackAddress); err != nil {
 		log.Fatalf("Stopping producer due to: %v", err)
 	}
@@ -94,7 +99,7 @@ func validateConfiguration(configuration *config.Config) error {
 }
 
 func registerTypesAndProducer(jobHandler jobs.JobTypeHandler, infoCoordinatorAddress string, callbackAddress string) error {
-	registrator := config.NewRegistratorImpl(infoCoordinatorAddress, httpClient)
+	registrator := config.NewRegistratorImpl(infoCoordinatorAddress, retryClient)
 	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)