diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-27 11:52:13 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-27 11:52:13 -0700 |
| commit | a133f82421d2c67ef32b0aae69a6646a14f97dfc (patch) | |
| tree | 35fe7dcf6b208437111c5d3a843eabf2f4703101 /utils/config.go | |
| parent | e22b9f53034280cd3b730c03520469dca4046484 (diff) | |
| parent | e0f69060fa462390779dd7b4cf6b67a12c3974ba (diff) | |
| download | chat-a133f82421d2c67ef32b0aae69a6646a14f97dfc.tar.gz chat-a133f82421d2c67ef32b0aae69a6646a14f97dfc.tar.bz2 chat-a133f82421d2c67ef32b0aae69a6646a14f97dfc.zip | |
Merge branch 'master' into PLT-340
Diffstat (limited to 'utils/config.go')
| -rw-r--r-- | utils/config.go | 7 |
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) |