more updates to logging settings

settings/__init__.py

@@ -11,7 +11,10 @@ try:
     # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473584
     # http://bugs.python.org/setuptools/issue36
     # import MySQLdb followed by import pkg_resources complains
-    #   /usr/lib/python2.6/dist-packages/pytz/__init__.py:32: UserWarning: Module _mysql was already imported from /usr/lib/pymodules/python2.6/_mysql.so, but /usr/lib/pymodules/python2.6 is being added to sys.path
+    #   /usr/lib/python2.6/dist-packages/pytz/__init__.py:32: 
+    #     UserWarning: Module _mysql was already imported from
+    #     /usr/lib/pymodules/python2.6/_mysql.so, but
+    #     /usr/lib/pymodules/python2.6 is being added to sys.path
     import pkg_resources
 except:
     pass
@@ -36,11 +39,12 @@ configs = {
 
 
 # Get custom settings file from configs dict, but
-# default to production if key not found.
+# default to production if ROOT_PATH key not found.
 config = configs.get(ROOT_PATH, "production")
 
 # If host is gracedb-test, use custom test settings.
-if socket.gethostname() == 'gracedb-test':
+hostname = socket.gethostname()
+if (hostname == 'gracedb-test'):
     config = 'test'
 
 # Import custom settings

settings/default.py

@@ -374,15 +374,15 @@ LOGGING = {
     },
     'handlers': {
         'null': {
-            'level':'DEBUG',
-            'class':'django.utils.log.NullHandler',
+            'level': 'DEBUG',
+            'class': 'django.utils.log.NullHandler',
         },
         'info_file': {
             'class': 'logging.handlers.TimedRotatingFileHandler',
             'formatter': 'simple',
             'filename': '%s/gracedb_info.log' % LOG_ROOT,
             'when': 'midnight',
-            'backupCount' : 10,
+            'backupCount': 10,
         },
         'performance_file': {
             'class': 'logging.FileHandler',
@@ -403,7 +403,7 @@ LOGGING = {
         'gracedb': {
             'handlers': ['info_file'],
             'propagate': True,
-            'level' : 'INFO',
+            'level': 'INFO',
         },
         'middleware': {
             'handlers': ['performance_file'],
@@ -412,8 +412,8 @@ LOGGING = {
         },
         'django.request': {
             'handlers': ['mail_admins'],
-            'level': 'ERROR',
             'propagate': False,
+            'level': 'ERROR',
         },
    },
 }

settings/test.py

 from settings_secret import *
-# Settings for Logging.
 import logging
+from cloghandler import ConcurrentRotatingFileHandler
 
 CONFIG_NAME = "TEST"
 
@@ -115,7 +115,7 @@ CONTROL_ROOM_IPS = {
 LOG_ROOT = '/home/gracedb/logs'
 LOG_FILE_SIZE = 1024*1024 # 1 MB
 LOG_FILE_BAK_CT = 3
-LOG_FORMAT = 'verbose'
+LOG_FORMAT = 'extra_verbose'
 LOG_LEVEL = 'DEBUG'
 
 # Note that mode for log files is 'a' (append) by default
@@ -126,18 +126,31 @@ LOGGING = {
     'disable_existing_loggers' : True,
     'formatters': {
         'simple': {
-            'format': '%(asctime)s %(message)s',
-            'datefmt': '%Y-%m-%dT%H:%M:%S',
+            'format': '%(asctime)s | %(message)s',
+            'datefmt': '%Y-%m-%d %H:%M:%S',
         },
         'verbose': {
-            'format': '%(asctime)s: %(name)s: %(message)s',
+            'format': '%(asctime)s | %(name)s | %(message)s',
             'datefmt': '%Y-%m-%d %H:%M:%S',
         },
+        'extra_verbose': {
+            'format': '%(asctime)s.%(msecs)03d | %(name)s | %(levelname)s | ' \
+                      + '%(filename)s, line %(lineno)s:\n\t%(message)s',
+            'datefmt': '%Y-%m-%d %H:%M:%S',
+        }
     },
     'handlers': {
         'null': {
-            'level':'DEBUG',
-            'class':'django.utils.log.NullHandler',
+            'level': 'DEBUG',
+            'class': 'django.utils.log.NullHandler',
+        },
+        'info_file': {
+            'class': 'logging.handlers.TimedRotatingFileHandler',
+            'formatter': 'simple',
+            'filename': '%s/gracedb_info.log' % LOG_ROOT,
+            'when': 'midnight',
+            'backupCount': 10,
+            'level': 'INFO',
         },
         'debug_file': {
             'class': 'logging.handlers.RotatingFileHandler',
@@ -145,8 +158,17 @@ LOGGING = {
             'filename': '%s/gracedb_debug.log' % LOG_ROOT,
             'maxBytes': LOG_FILE_SIZE,
             'backupCount': LOG_FILE_BAK_CT,
+            'level': 'DEBUG',
         },
-       'performance_file': {
+        'test_file': {
+            'class': 'logging.handlers.ConcurrentRotatingFileHandler',
+            'formatter': LOG_FORMAT,
+            'filename': '%s/gracedb_test.log' % LOG_ROOT,
+            'maxBytes': LOG_FILE_SIZE,
+            'backupCount': LOG_FILE_BAK_CT,
+            'level': 'DEBUG',
+        },
+        'performance_file': {
             'class': 'logging.FileHandler',
             'formatter': 'simple',
             'filename': '%s/gracedb_performance.log' % LOG_ROOT,
@@ -163,7 +185,7 @@ LOGGING = {
             'level': 'INFO',
         },
         'gracedb': {
-            'handlers': ['debug_file'],
+            'handlers': ['debug_file','info_file','test_file'],
             'propagate': True,
             'level': LOG_LEVEL,
         },
@@ -172,20 +194,20 @@ LOGGING = {
             'propagate': True,
             'level': LOG_LEVEL,
         },
-        'middleware': {
-            'handlers': ['performance_file'],
-            'propagate': True,
-            'level': 'INFO',
-        }, 
         'userprofile': {
             'handlers': ['debug_file'],
             'propagate': True,
             'level': LOG_LEVEL,
         },
-        'django.request': {
+        'middleware': {
+            'handlers': ['performance_file'],
+            'propagate': True,
+            'level': 'INFO',
+        },
+       'django.request': {
             'handlers': ['mail_admins'],
             'level': 'ERROR',
             'propagate': False,
-        },       
+        },
    },
 }

templates/base.html

@@ -48,7 +48,6 @@ function changeTime(obj, label) {
 
     <h2>{% block heading %}Title{% endblock %}</h2>
 
-<p>test</p>
         {% block content %}{% endblock %}
 
     </div>