summaryrefslogtreecommitdiffstats
path: root/utils/config.go
diff options
context:
space:
mode:
authorGirish S <girish.sonawane@gmail.com>2015-10-26 17:09:15 +0530
committerGirish S <girish.sonawane@gmail.com>2015-10-27 16:48:54 +0530
commitbfa23b0075b0e2c5100cc396a4360255f47303d3 (patch)
tree9403ba1449cb8d0e98d4a9e79d76e68b0ca7a8a4 /utils/config.go
parent28847c6b4b864d747bbfdf5c53354dcb24e5f895 (diff)
downloadchat-bfa23b0075b0e2c5100cc396a4360255f47303d3.tar.gz
chat-bfa23b0075b0e2c5100cc396a4360255f47303d3.tar.bz2
chat-bfa23b0075b0e2c5100cc396a4360255f47303d3.zip
adds trailing slash if missing from Directory in config.json
does it only if "DriverName" == model.IMAGE_DRIVER_LOCAL, not sure if required for other drivers too
Diffstat (limited to 'utils/config.go')
-rw-r--r--utils/config.go7
1 files changed, 7 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go
index fd9856a67..6b34c76ed 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -159,6 +159,13 @@ func LoadConfig(fileName string) {
configureLog(&config.LogSettings)
TestConnection(&config)
+ if config.FileSettings.DriverName == model.IMAGE_DRIVER_LOCAL {
+ dir := config.FileSettings.Directory
+ if len(dir) > 0 && dir[len(dir)-1:] != "/" {
+ config.FileSettings.Directory += "/"
+ }
+ }
+
Cfg = &config
SanitizeOptions = getSanitizeOptions(Cfg)
ClientCfg = getClientConfig(Cfg)