From 1b1955f9e67e35289a8428326be58b8d27bc82a8 Mon Sep 17 00:00:00 2001
From: Allan Callaghan <calaldees@gmail.com>
Date: Fri, 19 Dec 2014 08:02:28 +0000
Subject: [PATCH] Admin Dashboard logging output correctly configured

---
 .gitignore                         |  1 +
 website/.gitignore                 |  1 -
 website/development.ini.dist       | 28 ++++++++++++++++++++++++----
 website/karakara/views/feedback.py |  2 ++
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index b62b9fa8..7ebf20e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.log
 *.pid
 *.pyc
 *.vagrant
diff --git a/website/.gitignore b/website/.gitignore
index 9be47854..a53b412c 100644
--- a/website/.gitignore
+++ b/website/.gitignore
@@ -1,4 +1,3 @@
-*.log
 *.db
 *.db-journal
 *.egg-info
diff --git a/website/development.ini.dist b/website/development.ini.dist
index 3b139f2e..48b94133 100644
--- a/website/development.ini.dist
+++ b/website/development.ini.dist
@@ -61,7 +61,7 @@ karakara.search.list.alphabetical.tags = [from, artist]
 
 karakara.print_tracks.fields = [category, from, use, title, artist]
 
-# Comunity settings ------------------------------------------------------------
+# Comunity ---------------------------------------------------------------------
 
 comunity.title = KaraKara.org.uk
 
@@ -123,13 +123,15 @@ port = 6543
 # Logging -----------------------------------------------------------------------
 
 [loggers]
-keys = root, sqlalchemy, karakara, externals
+keys = root, sqlalchemy, karakara, externals, admindashboard
 
 [handlers]
-keys = console, logfile
+keys = console, logfile, admindashboard
 
 [formatters]
-keys = generic
+keys = generic, message_only
+
+# Loggers -------------------
 
 [logger_root]
 level = INFO
@@ -153,6 +155,8 @@ qualname = sqlalchemy.engine
 # "level = DEBUG" logs SQL queries and results.
 # "level = WARN" logs neither.  (Recommended for production systems.)
 
+# Log Handlers --------------
+
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
@@ -167,3 +171,19 @@ formatter = generic
 
 [formatter_generic]
 format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+[formatter_message_only]
+format = %(message)s
+
+# Admin Dashboard Logging -------------
+
+[logger_admindashboard]
+level = INFO
+handlers = admindashboard
+qualname = json_log_event
+
+[handler_admindashboard]
+class = FileHandler
+args = ('%(here)s/../admindashboard/events.log',)
+level = NOTSET
+formatter = message_only
diff --git a/website/karakara/views/feedback.py b/website/karakara/views/feedback.py
index 82ca6759..e8d5dc1f 100644
--- a/website/karakara/views/feedback.py
+++ b/website/karakara/views/feedback.py
@@ -1,6 +1,7 @@
 from pyramid.view import view_config
 
 from externals.lib.misc import strip_non_base_types
+from externals.lib.log import log_event
 from . import web, action_ok, action_error
 
 from ..model import DBSession
@@ -33,4 +34,5 @@ def feedback_view(request):
     DBSession.add(feedback)
 
     log.info('feedback - {0}'.format(request.params.get('details')))
+    log_event(request, **request.params)
     return action_ok(message='Feedback received, thank you!')