External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 17:37:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Bumped version number, updated settings and playbook to add support for logging via syslog.

Browse Source
This commit is contained in:
Chris Church
2013-05-30 01:02:43 -04:00
parent 40dd9b08be
commit 4fae801355
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MANIFEST.in
View File

@@ -9,5 +9,5 @@ include *.py *.txt *.md
include MANIFEST.in include MANIFEST.in
include COPYING include COPYING
prune ansibleworks/public prune ansibleworks/public
prune ansibleworks/project prune ansibleworks/projects
prune ansibleworks/ui/static/lib/jstree/_* prune ansibleworks/ui/static/lib/jstree/_*

2
ansibleworks/__init__.py
View File

@@ -1,7 +1,7 @@
# Copyright (c) 2013 AnsibleWorks, Inc. # Copyright (c) 2013 AnsibleWorks, Inc.
# All Rights Reserved. # All Rights Reserved.
__version__ = '1.2-b1' __version__ = '1.2-b2'
import os import os
import sys import sys

22
ansibleworks/settings/defaults.py
View File

@@ -217,17 +217,30 @@ LOGGING = {
'()': 'django.utils.log.RequireDebugTrue', '()': 'django.utils.log.RequireDebugTrue',
}, },
}, },
'formatters': {
'simple': {
'format': '%(asctime)s %(levelname)-8s %(name)s %(message)s',
},
},
'handlers': { 'handlers': {
'console': { 'console': {
'level': 'DEBUG', 'level': 'DEBUG',
'filters': ['require_debug_true'], 'filters': ['require_debug_true'],
'class': 'logging.StreamHandler', 'class': 'logging.StreamHandler',
'formatter': 'simple',
}, },
'null': { 'null': {
'class': 'django.utils.log.NullHandler', 'class': 'django.utils.log.NullHandler',
}, },
'file': { 'file': {
'class': 'django.utils.log.NullHandler', 'class': 'django.utils.log.NullHandler',
'formatter': 'simple',
},
'syslog': {
'level': 'ERROR',
'filters': ['require_debug_false'],
'class': 'django.utils.log.NullHandler',
'formatter': 'simple',
}, },
'mail_admins': { 'mail_admins': {
'level': 'ERROR', 'level': 'ERROR',
@@ -240,17 +253,16 @@ LOGGING = {
'handlers': ['console'], 'handlers': ['console'],
}, },
'django.request': { 'django.request': {
'handlers': ['mail_admins', 'console', 'file'], 'handlers': ['mail_admins', 'console', 'file', 'syslog'],
'level': 'ERROR', 'level': 'WARNING',
'propagate': False, 'propagate': False,
}, },
'py.warnings': { 'py.warnings': {
'handlers': ['console'], 'handlers': ['console'],
}, },
'ansibleworks.main': { 'ansibleworks': {
'handlers': ['console'], 'handlers': ['console', 'file', 'syslog'],
'level': 'DEBUG', 'level': 'DEBUG',
'filters': []
}, },
'ansibleworks.main.rbac': { 'ansibleworks.main.rbac': {
'handlers': ['null'], 'handlers': ['null'],