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 3a4935a..1aabdda 100644 (file)
--- a/dmaap-mediator-producer/main.go
+++ b/dmaap-mediator-producer/main.go
@@ -34,6 +34,7 @@ import (
 )
 
 var configuration *config.Config
+var registered bool
 
 func init() {
        configuration = config.New()
@@ -56,22 +57,16 @@ func main() {
        }
        retryClient := restclient.CreateRetryClient(cert)
 
-       jobsManager := jobs.NewJobsManagerImpl("configs/type_config.json", retryClient, configuration.DMaaPMRAddress, restclient.CreateClientWithoutRetry(cert, 10*time.Second))
+       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(jobsManager)
-               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()
 }
@@ -87,15 +82,17 @@ 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,
+               InfoProducerSupervisionCallbackUrl: callbackAddress + server.HealthCheckPath,
                SupportedInfoTypes:                 jobTypesHandler.GetSupportedTypes(),
                InfoJobCallbackUrl:                 callbackAddress + server.AddJobPath,
        }
@@ -105,6 +102,24 @@ func registerTypesAndProducer(jobTypesHandler jobs.JobTypesManager, infoCoordina
        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