From 4fae8013552391e45b7e539496673ff2ff72881a Mon Sep 17 00:00:00 2001
From: Chris Church <chris@ninemoreminutes.com>
Date: Thu, 30 May 2013 01:02:43 -0400
Subject: [PATCH] Bumped version number, updated settings and playbook to add
 support for logging via syslog.

---
 MANIFEST.in                       |  2 +-
 ansibleworks/__init__.py          |  2 +-
 ansibleworks/settings/defaults.py | 22 +++++++++++++++++-----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 7e59e412dc..eee47c42c8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -9,5 +9,5 @@ include *.py *.txt *.md
 include MANIFEST.in
 include COPYING
 prune ansibleworks/public
-prune ansibleworks/project
+prune ansibleworks/projects
 prune ansibleworks/ui/static/lib/jstree/_*
diff --git a/ansibleworks/__init__.py b/ansibleworks/__init__.py
index 5d232541f1..176fe860c3 100644
--- a/ansibleworks/__init__.py
+++ b/ansibleworks/__init__.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2013 AnsibleWorks, Inc.
 # All Rights Reserved.
 
-__version__ = '1.2-b1'
+__version__ = '1.2-b2'
 
 import os
 import sys
diff --git a/ansibleworks/settings/defaults.py b/ansibleworks/settings/defaults.py
index 3dbaa999be..0f10a011c7 100644
--- a/ansibleworks/settings/defaults.py
+++ b/ansibleworks/settings/defaults.py
@@ -217,17 +217,30 @@ LOGGING = {
             '()': 'django.utils.log.RequireDebugTrue',
         },
     },
+    'formatters': {
+        'simple': {
+            'format': '%(asctime)s %(levelname)-8s %(name)s %(message)s',
+        },
+    },
     'handlers': {
         'console': {
             'level': 'DEBUG',
             'filters': ['require_debug_true'],
             'class': 'logging.StreamHandler',
+            'formatter': 'simple',
         },
         'null': {
             'class': 'django.utils.log.NullHandler',
         },
         'file': {
             'class': 'django.utils.log.NullHandler',
+            'formatter': 'simple',
+        },
+        'syslog': {
+            'level': 'ERROR',
+            'filters': ['require_debug_false'],
+            'class': 'django.utils.log.NullHandler',
+            'formatter': 'simple',
         },
         'mail_admins': {
             'level': 'ERROR',
@@ -240,17 +253,16 @@ LOGGING = {
             'handlers': ['console'],
         },
         'django.request': {
-            'handlers': ['mail_admins', 'console', 'file'],
-            'level': 'ERROR',
+            'handlers': ['mail_admins', 'console', 'file', 'syslog'],
+            'level': 'WARNING',
             'propagate': False,
         },
         'py.warnings': {
             'handlers': ['console'],
         },
-        'ansibleworks.main': {
-            'handlers': ['console'],
+        'ansibleworks': {
+            'handlers': ['console', 'file', 'syslog'],
             'level': 'DEBUG',
-            'filters': []
         },
         'ansibleworks.main.rbac': {
             'handlers': ['null'],