Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
a1aa6c2f
Commit
a1aa6c2f
authored
Aug 01, 2014
by
John Jarvis
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4652 from edx/jarv/only-add-handler-if-rsyslog
allow rsyslog to be none
parents
9c52e5d7
8d849f80
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
6 deletions
+9
-6
common/lib/logsettings.py
+9
-6
No files found.
common/lib/logsettings.py
View file @
a1aa6c2f
...
@@ -84,12 +84,6 @@ def get_logger_config(log_dir,
...
@@ -84,12 +84,6 @@ def get_logger_config(log_dir,
'filters'
:
[
'require_debug_false'
],
'filters'
:
[
'require_debug_false'
],
'class'
:
'django.utils.log.AdminEmailHandler'
'class'
:
'django.utils.log.AdminEmailHandler'
},
},
'syslogger-remote'
:
{
'level'
:
'INFO'
,
'class'
:
'logging.handlers.SysLogHandler'
,
'address'
:
syslog_addr
,
'formatter'
:
'syslog_format'
,
},
'newrelic'
:
{
'newrelic'
:
{
'level'
:
'ERROR'
,
'level'
:
'ERROR'
,
'class'
:
'lms.lib.newrelic_logging.NewRelicHandler'
,
'class'
:
'lms.lib.newrelic_logging.NewRelicHandler'
,
...
@@ -114,6 +108,15 @@ def get_logger_config(log_dir,
...
@@ -114,6 +108,15 @@ def get_logger_config(log_dir,
},
},
}
}
}
}
if
syslog_addr
:
logger_config
[
'handlers'
]
.
update
({
'syslogger-remote'
:
{
'level'
:
'INFO'
,
'class'
:
'logging.handlers.SysLogHandler'
,
'address'
:
syslog_addr
,
'formatter'
:
'syslog_format'
,
},
})
if
dev_env
:
if
dev_env
:
tracking_file_loc
=
os
.
path
.
join
(
log_dir
,
tracking_filename
)
tracking_file_loc
=
os
.
path
.
join
(
log_dir
,
tracking_filename
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment