From d4cfae3addfdebd8e1d7c506429d20b1fef0977d Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Sun, 26 Jul 2015 20:43:24 +0100
Subject: [PATCH] Fixed console logging

---
 api/views.py       |  8 ++++----
 dss/logsettings.py | 10 +++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/api/views.py b/api/views.py
index 0ca3e42..9bf1d9c 100755
--- a/api/views.py
+++ b/api/views.py
@@ -27,7 +27,7 @@ from spa.models.comment import Comment
 from spa.models.notification import Notification
 from spa.models.userprofile import UserProfile
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('spa')
 
 
 class AnonymousWriteUserDelete(BasePermission):
@@ -175,7 +175,7 @@ class PartialMixUploadView(views.APIView):
 
             try:
                 logger.debug("Received input file")
-                logger.debug("Storage is %s".format(file_storate.base_location))
+                logger.debug("Storage is {0}".format(file_storate.base_location))
                 input_file = os.path.join(file_storage.base_location, cache_file)
                 logger.debug("Input file generating")
 
@@ -186,7 +186,7 @@ class PartialMixUploadView(views.APIView):
                  archive_mix_task.s(filetype='mp3', uid=uid)).delay()
 
             except Exception, ex:
-                logger.error("Unable to connect to celery: %s".format(ex.message))
+                logger.error("Unable to connect to celery: {0}".format(ex.message))
                 response = \
                     'Unable to connect to waveform generation task, there may be a delay in getting your mix online'
 
@@ -218,7 +218,7 @@ class ActivityViewSet(viewsets.ModelViewSet):
         ret = ActivityPlay.objects.filter(mix__user=user).order_by("-id")
 
         if len(ret) > 0:
-            logger.debug("Activity returned: %s".format(ret[0].get_object_slug()))
+            logger.debug("Activity returned: {0}".format(ret[0].get_object_slug()))
             return ret
         else:
             return []
diff --git a/dss/logsettings.py b/dss/logsettings.py
index e7d88c2..a98888a 100755
--- a/dss/logsettings.py
+++ b/dss/logsettings.py
@@ -1,4 +1,5 @@
 import os
+import sys
 from dss import localsettings
 
 if os.name == 'posix':
@@ -20,11 +21,14 @@ LOGGING = {
     },
     'handlers': {
         'file': {
-            'level': 'DEBUG',
+            'level': 'INFO',
             'class': 'logging.FileHandler',
             'filename': LOG_FILE,
             'formatter': 'verbose'
-        },
+        }, 'console': {
+            'class': 'logging.StreamHandler',
+            'stream': sys.stdout,
+        }
     },
     'loggers': {
         'django': {
@@ -33,7 +37,7 @@ LOGGING = {
             'level': 'DEBUG',
         },
         'spa': {
-            'handlers': ['file'],
+            'handlers': ['file', 'console'],
             'level': 'DEBUG',
         },
     }