Browse Source

initial data loading: an error is no longer fatal

therefore it does not prevent the services from starting
Nicola Murino 4 years ago
parent
commit
6699f5c2cc
3 changed files with 4 additions and 5 deletions
  1. 1 1
      dataprovider/dataprovider.go
  2. 3 3
      dataprovider/memory.go
  3. 0 1
      service/service.go

+ 1 - 1
dataprovider/dataprovider.go

@@ -764,7 +764,7 @@ func createProvider(basePath string) error {
 	} else if config.Driver == BoltDataProviderName {
 	} else if config.Driver == BoltDataProviderName {
 		err = initializeBoltProvider(basePath)
 		err = initializeBoltProvider(basePath)
 	} else if config.Driver == MemoryDataProviderName {
 	} else if config.Driver == MemoryDataProviderName {
-		err = initializeMemoryProvider(basePath)
+		initializeMemoryProvider(basePath)
 	} else {
 	} else {
 		err = fmt.Errorf("unsupported data provider: %v", config.Driver)
 		err = fmt.Errorf("unsupported data provider: %v", config.Driver)
 	}
 	}

+ 3 - 3
dataprovider/memory.go

@@ -41,7 +41,7 @@ type MemoryProvider struct {
 	dbHandle *memoryProviderHandle
 	dbHandle *memoryProviderHandle
 }
 }
 
 
-func initializeMemoryProvider(basePath string) error {
+func initializeMemoryProvider(basePath string) {
 	logSender = fmt.Sprintf("dataprovider_%v", MemoryDataProviderName)
 	logSender = fmt.Sprintf("dataprovider_%v", MemoryDataProviderName)
 	configFile := ""
 	configFile := ""
 	if utils.IsFileInputValid(config.Name) {
 	if utils.IsFileInputValid(config.Name) {
@@ -62,9 +62,9 @@ func initializeMemoryProvider(basePath string) error {
 		},
 		},
 	}
 	}
 	if err := provider.reloadConfig(); err != nil {
 	if err := provider.reloadConfig(); err != nil {
+		logger.Error(logSender, "", "unable to load initial data: %v", err)
 		logger.ErrorToConsole("unable to load initial data: %v", err)
 		logger.ErrorToConsole("unable to load initial data: %v", err)
 	}
 	}
-	return nil
 }
 }
 
 
 func (p MemoryProvider) checkAvailability() error {
 func (p MemoryProvider) checkAvailability() error {
@@ -604,7 +604,7 @@ func (p MemoryProvider) clear() {
 }
 }
 
 
 func (p MemoryProvider) reloadConfig() error {
 func (p MemoryProvider) reloadConfig() error {
-	if len(p.dbHandle.configFile) == 0 {
+	if p.dbHandle.configFile == "" {
 		providerLog(logger.LevelDebug, "no users configuration file defined")
 		providerLog(logger.LevelDebug, "no users configuration file defined")
 		return nil
 		return nil
 	}
 	}

+ 0 - 1
service/service.go

@@ -105,7 +105,6 @@ func (s *Service) Start() error {
 	if err != nil {
 	if err != nil {
 		logger.Error(logSender, "", "unable to load initial data: %v", err)
 		logger.Error(logSender, "", "unable to load initial data: %v", err)
 		logger.ErrorToConsole("unable to load initial data: %v", err)
 		logger.ErrorToConsole("unable to load initial data: %v", err)
-		return err
 	}
 	}
 
 
 	httpConfig := config.GetHTTPConfig()
 	httpConfig := config.GetHTTPConfig()