X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=plgng%2Fsettings_logging.py;h=67f51111e2cba13c71b1697b96ce4f44ded2a0b3;hb=a945631944ec9e01984c508d7725358678e574a8;hp=21817caff4c338a147d27fb50f0c6329ba592ce0;hpb=22194d251f02c0a2461e0defa13e9b3ad153bd2f;p=qcg-portal.git

diff --git a/plgng/settings_logging.py b/plgng/settings_logging.py
index 21817ca..67f5111 100644
--- a/plgng/settings_logging.py
+++ b/plgng/settings_logging.py
@@ -17,20 +17,20 @@ LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,
     'formatters': {
-        'verbose': {
-            'format': '[%(asctime)s] %(levelname)-8s - %(status_code)s - %(message)s',
+        'request': {
+            'format': '[%(asctime)s] %(levelname)-8s %(client)16s - %(status_code)s - %(message)s',
             'datefmt': DATE_FORMAT,
         },
         'simple': {
-            'format': '%(levelname)s %(message)s',
+            'format': '[%(asctime)s] %(levelname)-8s - %(message)s',
             'datefmt': DATE_FORMAT,
         },
-        'request': {
-            'format': '[%(asctime)s] %(levelname)-8s %(client)16s - %(status_code)s - %(message)s',
+        'verbose': {
+            'format': '[%(asctime)s] %(levelname)-8s - %(filename)s:%(lineno)s in %(funcName)s - %(message)s',
             'datefmt': DATE_FORMAT,
         },
-        'date_msg': {
-            'format': '[%(asctime)s] %(levelname)-8s %(message)s',
+        'gridftp': {
+            'format': '[%(asctime)s] %(levelname)-8s - %(path)s - <%(user)s> - %(params)s - %(message)s',
             'datefmt': DATE_FORMAT,
         },
     },
@@ -43,17 +43,17 @@ LOGGING = {
         'console': {
             'level': 'DEBUG',
             'class': 'logging.StreamHandler',
-            'formatter': 'simple'
         },
-        'main_log': {
+        'main': {
             'level': 'INFO',
             'class': 'logging.handlers.RotatingFileHandler',
             'filename': os.path.join(LOGS_DIR, 'main.log'),
             'maxBytes': 1024 * 1024 * 5,  # 5 MB
             'backupCount': 10,
-            'formatter': 'verbose'
+            'formatter': 'request',
+            'filters': ['request_filter']
         },
-        'request_log': {
+        'request': {
             'level': 'INFO',
             'class': 'logging.handlers.RotatingFileHandler',
             'filename': os.path.join(LOGS_DIR, 'requests.log'),
@@ -62,40 +62,63 @@ LOGGING = {
             'formatter': 'request',
             'filters': ['request_filter']
         },
-        'openid_log': {
+        'openid': {
             'level': 'INFO',
             'class': 'logging.handlers.RotatingFileHandler',
             'filename': os.path.join(LOGS_DIR, 'openid.log'),
             'maxBytes': 1024 * 1024 * 5,  # 5 MB
-            'formatter': 'request',
-            'filters': ['request_filter']
+            'formatter': 'simple',
         },
-        'sql_log': {
+        'sql': {
             'level': 'DEBUG',
             'class': 'logging.handlers.RotatingFileHandler',
             'filename': os.path.join(LOGS_DIR, 'sql.log'),
             'maxBytes': 1024 * 1024 * 5,  # 5 MB
-            'formatter': 'date_msg',
+            'formatter': 'simple',
+        },
+        'service': {
+            'level': 'DEBUG',
+            'class': 'logging.handlers.RotatingFileHandler',
+            'filename': os.path.join(LOGS_DIR, 'service.log'),
+            'maxBytes': 1024 * 1024 * 5,  # 5 MB
+            'formatter': 'verbose',
+        },
+        'gridftp': {
+            'level': 'DEBUG',
+            'class': 'logging.handlers.RotatingFileHandler',
+            'filename': os.path.join(LOGS_DIR, 'gridftp.log'),
+            'maxBytes': 1024 * 1024 * 5,  # 5 MB
+            'formatter': 'gridftp',
         },
     },
     'loggers': {
         'django': {
-            'handlers': ['main_log'],
+            'handlers': ['main'],
             'level': 'INFO',
         },
         'django.request': {
-            'handlers': ['request_log'],
+            'handlers': ['request'],
             'level': 'INFO',
             'propagate': False,
         },
         'django.db.backends': {
-            'handlers': ['sql_log'],
+            'handlers': ['sql'],
             'level': 'DEBUG',
             'propagate': False,
         },
         'openid': {
-            'handlers': ['openid_log'],
+            'handlers': ['openid'],
             'level': 'INFO',
         },
+        'qcg.service': {
+            'handlers': ['service'],
+            'level': 'INFO',
+            'propagate': False,
+        },
+        'gridftp': {
+            'handlers': ['gridftp'],
+            'level': 'INFO',
+        },
+
     }
 }