From 88cccd7290bc22c8457aa4f73c46597c97f2612e Mon Sep 17 00:00:00 2001 From: DanB Date: Tue, 24 Oct 2017 11:23:13 +0200 Subject: [PATCH] cgr-loader to stop on errors, fixes #780 --- cmd/cgr-loader/cgr-loader.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go index d965290fd..745c78fd7 100755 --- a/cmd/cgr-loader/cgr-loader.go +++ b/cmd/cgr-loader/cgr-loader.go @@ -93,18 +93,18 @@ func main() { } else { // Default load from csv files to dataDb dm, errDataDB = engine.ConfigureDataStorage(*datadb_type, *datadb_host, *datadb_port, *datadb_name, *datadb_user, *datadb_pass, *dbdata_encoding, config.CgrConfig().CacheConfig, *loadHistorySize) } - // Defer databases opened to be closed when we are done - for _, db := range []engine.Storage{dm.DataDB(), storDb} { - if db != nil { - defer db.Close() - } - } // Stop on db errors for _, err = range []error{errDataDB, errDataDB, errStorDb} { if err != nil { log.Fatalf("Could not open database connection: %v", err) } } + // Defer databases opened to be closed when we are done + for _, db := range []engine.Storage{dm.DataDB(), storDb} { + if db != nil { + defer db.Close() + } + } if *toStorDb { // Import files from a directory into storDb if *tpid == "" { log.Fatal("TPid required, please define it via *-tpid* command argument.")