Some tidying in the pom files

[nonrtric.git] / dmaap-mediator-producer / main.go

diff --git a/dmaap-mediator-producer/main.go b/dmaap-mediator-producer/main.go
index cdfde57..1aabdda 100644 (file)
--- 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"
@@ -35,6 +34,7 @@ import (
 )
 
 var configuration *config.Config
+var registered bool
 
 func init() {
        configuration = config.New()
@@ -43,33 +43,30 @@ 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)
 
-       jobHandler := jobs.NewJobHandlerImpl("configs/type_config.json", retryClient, &http.Client{
-               Timeout: time.Second * 5,
-       })
-       if err := registerTypesAndProducer(jobHandler, configuration.InfoCoordinatorAddress, callbackAddress, retryClient); err != nil {
+       jobsManager := jobs.NewJobsManagerImpl(retryClient, configuration.DMaaPMRAddress, restclient.CreateClientWithoutRetry(cert, 10*time.Second))
+       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")
-       go func() {
-               log.Debugf("Starting callback server at port %v", configuration.InfoProducerPort)
-               r := server.NewRouter(jobHandler)
-               log.Fatalf("Server stopped: %v", http.ListenAndServeTLS(fmt.Sprintf(":%v", configuration.InfoProducerPort), configuration.ProducerCertPath, configuration.ProducerKeyPath, r))
-       }()
-
-       go jobHandler.RunJobs(configuration.DMaaPMRAddress)
 
        keepProducerAlive()
 }
@@ -83,43 +80,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", configuration.ProducerCertPath, configuration.ProducerKeyPath)
+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.JobTypeHandler, infoCoordinatorAddress string, callbackAddress string, client restclient.HTTPClient) error {
-       registrator := config.NewRegistratorImpl(infoCoordinatorAddress, client)
-       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)
-       }
        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 {
@@ -128,6 +102,24 @@ 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