summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-08-28 04:42:16 -0700
committerJoram Wilander <jwawilander@gmail.com>2017-08-28 07:42:16 -0400
commitf9837c3ac0c7f611363250684d85be5403a9aa10 (patch)
tree8dcb6d6d00773a991e6ad7139ca002a2e890096f /utils
parentc81d0f120a085df806388d41f10c89b5eb898de9 (diff)
downloadchat-f9837c3ac0c7f611363250684d85be5403a9aa10.tar.gz
chat-f9837c3ac0c7f611363250684d85be5403a9aa10.tar.bz2
chat-f9837c3ac0c7f611363250684d85be5403a9aa10.zip
Use path.Join to form log filename (#7293)
Omitting the trailing backslash in the directory could cause Mattermost to crash due to permission issues.
Diffstat (limited to 'utils')
-rw-r--r--utils/config.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/config.go b/utils/config.go
index 54d768f64..399e3a54c 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -10,6 +10,7 @@ import (
"io"
"io/ioutil"
"os"
+ "path"
"path/filepath"
"strconv"
"strings"
@@ -170,7 +171,7 @@ func GetLogFileLocation(fileLocation string) string {
logDir, _ := FindDir("logs")
return logDir + LOG_FILENAME
} else {
- return fileLocation + LOG_FILENAME
+ return path.Join(fileLocation, LOG_FILENAME)
}
}