summaryrefslogtreecommitdiffstats
path: root/cmd/platform/init.go
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-05-23 11:06:25 -0400
committerGitHub <noreply@github.com>2017-05-23 11:06:25 -0400
commit5c1049054eace710abd3418bbad141fbb7dd5d7f (patch)
tree24d75c14ce2aae2c6f1a8d5bc7392e958e416666 /cmd/platform/init.go
parent69f3f2fdce4ae21a037ca61d753279efcc70f0ec (diff)
downloadchat-5c1049054eace710abd3418bbad141fbb7dd5d7f.tar.gz
chat-5c1049054eace710abd3418bbad141fbb7dd5d7f.tar.bz2
chat-5c1049054eace710abd3418bbad141fbb7dd5d7f.zip
PLT-6471 Properly panic when translations can't be loaded (#6414)
* PLT-6471 Properly panic when translations can't be loaded * Print usage messages when errors occur during CLI initialization * Reverted behaviour of FindDir and added second return value to it * Fixed merge conflict
Diffstat (limited to 'cmd/platform/init.go')
-rw-r--r--cmd/platform/init.go14
1 files changed, 10 insertions, 4 deletions
diff --git a/cmd/platform/init.go b/cmd/platform/init.go
index b650cf2fd..5f915b9ab 100644
--- a/cmd/platform/init.go
+++ b/cmd/platform/init.go
@@ -12,14 +12,18 @@ func initDBCommandContextCobra(cmd *cobra.Command) error {
if err != nil {
return err
}
- initDBCommandContext(config)
+
+ if err := initDBCommandContext(config); err != nil {
+ // Returning an error just prints the usage message, so actually panic
+ panic(err)
+ }
return nil
}
-func initDBCommandContext(configFileLocation string) {
- if errstr := utils.InitAndLoadConfig(configFileLocation); errstr != "" {
- return
+func initDBCommandContext(configFileLocation string) error {
+ if err := utils.InitAndLoadConfig(configFileLocation); err != nil {
+ return err
}
utils.ConfigureCmdLineLog()
@@ -29,4 +33,6 @@ func initDBCommandContext(configFileLocation string) {
if model.BuildEnterpriseReady == "true" {
app.LoadLicense()
}
+
+ return nil
}