From 6699f5c2cc88c86f0b735c7556ff549652ca74b8 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Wed, 25 Nov 2020 09:18:36 +0100 Subject: [PATCH] initial data loading: an error is no longer fatal therefore it does not prevent the services from starting --- dataprovider/dataprovider.go | 2 +- dataprovider/memory.go | 6 +++--- service/service.go | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dataprovider/dataprovider.go b/dataprovider/dataprovider.go index 9dfd0e22..b3b4a317 100644 --- a/dataprovider/dataprovider.go +++ b/dataprovider/dataprovider.go @@ -764,7 +764,7 @@ func createProvider(basePath string) error { } else if config.Driver == BoltDataProviderName { err = initializeBoltProvider(basePath) } else if config.Driver == MemoryDataProviderName { - err = initializeMemoryProvider(basePath) + initializeMemoryProvider(basePath) } else { err = fmt.Errorf("unsupported data provider: %v", config.Driver) } diff --git a/dataprovider/memory.go b/dataprovider/memory.go index 5c1a26f9..09c9bd08 100644 --- a/dataprovider/memory.go +++ b/dataprovider/memory.go @@ -41,7 +41,7 @@ type MemoryProvider struct { dbHandle *memoryProviderHandle } -func initializeMemoryProvider(basePath string) error { +func initializeMemoryProvider(basePath string) { logSender = fmt.Sprintf("dataprovider_%v", MemoryDataProviderName) configFile := "" if utils.IsFileInputValid(config.Name) { @@ -62,9 +62,9 @@ func initializeMemoryProvider(basePath string) error { }, } 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) } - return nil } func (p MemoryProvider) checkAvailability() error { @@ -604,7 +604,7 @@ func (p MemoryProvider) clear() { } func (p MemoryProvider) reloadConfig() error { - if len(p.dbHandle.configFile) == 0 { + if p.dbHandle.configFile == "" { providerLog(logger.LevelDebug, "no users configuration file defined") return nil } diff --git a/service/service.go b/service/service.go index 69b17cf8..98a9ad84 100644 --- a/service/service.go +++ b/service/service.go @@ -105,7 +105,6 @@ func (s *Service) Start() error { if err != nil { logger.Error(logSender, "", "unable to load initial data: %v", err) logger.ErrorToConsole("unable to load initial data: %v", err) - return err } httpConfig := config.GetHTTPConfig()