PLT-5906 Set logs path instead log filename

mattermost · Apr 3, 2017 · 74e2b7c · 74e2b7c
1 parent 67a8770
commit 74e2b7c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/utils/config.go b/utils/config.go
@@ -26,6 +26,7 @@ const (
 	MODE_BETA       = "beta"
 	MODE_PROD       = "prod"
 	LOG_ROTATE_SIZE = 10000
+	LOG_FILENAME    = "mattermost.log"
 )
 
 var Cfg *model.Config = &model.Config{}
@@ -133,9 +134,9 @@ func configureLog(s *model.LogSettings) {
 
 func GetLogFileLocation(fileLocation string) string {
 	if fileLocation == "" {
-		return FindDir("logs") + "mattermost.log"
+		return FindDir("logs") + LOG_FILENAME
 	} else {
-		return fileLocation
+		return fileLocation + LOG_FILENAME
 	}
 }
 

diff --git a/webapp/components/admin_console/log_settings.jsx b/webapp/components/admin_console/log_settings.jsx
@@ -112,7 +112,7 @@ export default class LogSettings extends AdminSettings {
                     helpText={
                         <FormattedMessage
                             id='admin.log.fileDescription'
-                            defaultMessage='Typically set to true in production.  When true, log files are written to the log file specified in file location field below.'
+                            defaultMessage='Typically set to true in production.  When true, log files are written to the mattermost.log file specified in the location field below.'
                         />
                     }
                     value={this.state.enableFile}
@@ -149,7 +149,7 @@ export default class LogSettings extends AdminSettings {
                     helpText={
                         <FormattedMessage
                             id='admin.log.locationDescription'
-                            defaultMessage='File to which log files are written. If blank, will be set to ./logs/mattermost, which writes logs to mattermost.log. Log rotation is enabled and every 10,000 lines of log information is written to new files stored in the same directory, for example mattermost.2015-09-23.001, mattermost.2015-09-23.002, and so forth.'
+                            defaultMessage='Path to which log files are written. If blank, will be set to ./logs/, which writes logs to mattermost.log. Log rotation is enabled and every 10,000 lines of log information is written to new files stored in the same directory, for example mattermost.2015-09-23.001, mattermost.2015-09-23.002, and so forth.'
                         />
                     }
                     value={this.state.fileLocation}

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
@@ -508,7 +508,7 @@
   "admin.log.enableDiagnosticsDescription": "Enable this feature to improve the quality and performance of Mattermost by sending error reporting and diagnostic information to Mattermost, Inc. Read our <a href=\"https://about.mattermost.com/default-privacy-policy/\" target='_blank'>privacy policy</a> to learn more.",
   "admin.log.enableWebhookDebugging": "Enable Webhook Debugging:",
   "admin.log.enableWebhookDebuggingDescription": "You can set this to false to disable the debug logging of all incoming webhook request bodies.",
-  "admin.log.fileDescription": "Typically set to true in production.  When true, log files are written to the log file specified in file location field below.",
+  "admin.log.fileDescription": "Typically set to true in production.  When true, log files are written to the mattermost.log file specified in the location field below.",
   "admin.log.fileLevelDescription": "This setting determines the level of detail at which log events are written to the log file. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers working on debugging issues.",
   "admin.log.fileLevelTitle": "File Log Level:",
   "admin.log.fileTitle": "Output logs to file: ",
@@ -523,7 +523,7 @@
   "admin.log.formatTitle": "File Log Format:",
   "admin.log.levelDescription": "This setting determines the level of detail at which log events are written to the console. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers working on debugging issues.",
   "admin.log.levelTitle": "Console Log Level:",
-  "admin.log.locationDescription": "File to which log files are written. If blank, will be set to ./logs/mattermost, which writes logs to mattermost.log. Log rotation is enabled and every 10,000 lines of log information is written to new files stored in the same directory, for example mattermost.2015-09-23.001, mattermost.2015-09-23.002, and so forth.",
+  "admin.log.locationDescription": "Path to which log files are written. If blank, will be set to ./logs/, which writes logs to mattermost.log. Log rotation is enabled and every 10,000 lines of log information is written to new files stored in the same directory, for example mattermost.2015-09-23.001, mattermost.2015-09-23.002, and so forth.",
   "admin.log.locationPlaceholder": "Enter your file location",
   "admin.log.locationTitle": "File Log Directory:",
   "admin.log.logSettings": "Log Settings",