瀏覽代碼

[log] Improve Hue logging (#3313)

- Tested Hue logs all events as they were missed during socket base logging improvement.
Prakash Ranade 2 年之前
父節點
當前提交
48918f5a0e
共有 4 個文件被更改,包括 160 次插入72 次删除
  1. 17 32
      desktop/conf.dist/gunicorn_log.conf
  2. 63 4
      desktop/conf.dist/log.conf
  3. 17 32
      desktop/conf/gunicorn_log.conf
  4. 63 4
      desktop/conf/log.conf

+ 17 - 32
desktop/conf.dist/gunicorn_log.conf

@@ -11,92 +11,77 @@
 ########################################
 ########################################
 
 
 [logger_root]
 [logger_root]
+level=NOTSET
 handlers=logfile,errorlog
 handlers=logfile,errorlog
 
 
 [logger_access]
 [logger_access]
+level=NOTSET
 handlers=accesslog
 handlers=accesslog
 qualname=access
 qualname=access
 
 
 [logger_django_auth_ldap]
 [logger_django_auth_ldap]
+level=NOTSET
 handlers=accesslog
 handlers=accesslog
 qualname=django_auth_ldap
 qualname=django_auth_ldap
 
 
 [logger_kazoo_client]
 [logger_kazoo_client]
-level=INFO
+level=NOTSET
 handlers=errorlog
 handlers=errorlog
 qualname=kazoo.client
 qualname=kazoo.client
 
 
 [logger_djangosaml2]
 [logger_djangosaml2]
-level=INFO
+level=NOTSET
 handlers=errorlog
 handlers=errorlog
 qualname=djangosaml2
 qualname=djangosaml2
 
 
 [logger_requests_packages_urllib3_connectionpool]
 [logger_requests_packages_urllib3_connectionpool]
-level=DEBUG
+level=NOTSET
 handlers=errorlog
 handlers=errorlog
 qualname=requests.packages.urllib3.connectionpool
 qualname=requests.packages.urllib3.connectionpool
 
 
 [logger_django_db]
 [logger_django_db]
-level=DEBUG
+level=NOTSET
 handlers=errorlog
 handlers=errorlog
 qualname=django.db.backends
 qualname=django.db.backends
 
 
 [logger_boto]
 [logger_boto]
-level=ERROR
+level=NOTSET
 handlers=errorlog
 handlers=errorlog
 qualname=boto
 qualname=boto
 
 
-[logger_gunicorn.error]
-level=INFO
-handlers=errorlog
-propagate=1
-qualname=gunicorn.error
-
-[logger_gunicorn.access]
-level=INFO
-handlers=accesslog
-propagate=0
-qualname=gunicorn.access
-
 [handler_stderr]
 [handler_stderr]
 class=StreamHandler
 class=StreamHandler
 formatter=default
 formatter=default
-level=DEBUG
+level=NOTSET
 args=(sys.stderr,)
 args=(sys.stderr,)
 
 
-[handler_stdout]
-class=StreamHandler
-formatter=default
-level=DEBUG
-args=(sys.stdout,)
-
 [handler_accesslog]
 [handler_accesslog]
 class=handlers.RotatingFileHandler
 class=handlers.RotatingFileHandler
-level=INFO
+level=NOTSET
 propagate=True
 propagate=True
 formatter=access
 formatter=access
 args=('%LOG_DIR%/access.log', 'a', 5000000, 5)
 args=('%LOG_DIR%/access.log', 'a', 5000000, 5)
 
 
 [handler_errorlog]
 [handler_errorlog]
 class=handlers.RotatingFileHandler
 class=handlers.RotatingFileHandler
-level=ERROR
+level=NOTSET
 formatter=default
 formatter=default
 args=('%LOG_DIR%/error.log', 'a', 5000000, 5)
 args=('%LOG_DIR%/error.log', 'a', 5000000, 5)
 
 
 [handler_logfile]
 [handler_logfile]
 class=handlers.RotatingFileHandler
 class=handlers.RotatingFileHandler
 # Choices are DEBUG, INFO, WARNING, ERROR, CRITICAL
 # Choices are DEBUG, INFO, WARNING, ERROR, CRITICAL
-level=DEBUG
+level=NOTSET
 formatter=default
 formatter=default
 args=('%LOG_DIR%/rungunicornserver.log', 'a', 5000000, 5)
 args=('%LOG_DIR%/rungunicornserver.log', 'a', 5000000, 5)
 
 
 [formatter_default]
 [formatter_default]
-class=logging.Formatter
+class=desktop.log.formatter.Formatter
 format=[%(asctime)s] %(module)-12s %(levelname)-8s %(message)s
 format=[%(asctime)s] %(module)-12s %(levelname)-8s %(message)s
 datefmt=%d/%b/%Y %H:%M:%S %z
 datefmt=%d/%b/%Y %H:%M:%S %z
 
 
 [formatter_access]
 [formatter_access]
-class=logging.Formatter
+class=desktop.log.formatter.Formatter
 format=[%(asctime)s] %(levelname)-8s %(message)s
 format=[%(asctime)s] %(levelname)-8s %(message)s
 datefmt=%d/%b/%Y %H:%M:%S %z
 datefmt=%d/%b/%Y %H:%M:%S %z
 
 
@@ -106,10 +91,10 @@ datefmt=%d/%b/%Y %H:%M:%S %z
 ########################################
 ########################################
 
 
 [loggers]
 [loggers]
-keys=root,access,django_auth_ldap,kazoo_client,requests_packages_urllib3_connectionpool,djangosaml2,django_db,boto,gunicorn.error,gunicorn.access
+keys=root,access,django_auth_ldap,kazoo_client,requests_packages_urllib3_connectionpool,djangosaml2,django_db,boto
 
 
 [handlers]
 [handlers]
-keys=stderr,logfile,accesslog,errorlog,stdout
+keys=stderr,logfile,accesslog,errorlog
 
 
 [formatters]
 [formatters]
-keys=default,access
+keys=default,access

+ 63 - 4
desktop/conf.dist/log.conf

@@ -9,12 +9,65 @@
 # Developers may set the DESKTOP_DEBUG environment variable to
 # Developers may set the DESKTOP_DEBUG environment variable to
 # enable stderr logging output.
 # enable stderr logging output.
 ########################################
 ########################################
+
 [logger_root]
 [logger_root]
-handlers=logfile
+handlers=logfile,errorlog
+
+[logger_access]
+handlers=accesslog
+qualname=access
+
+[logger_django_auth_ldap]
+handlers=accesslog
+qualname=django_auth_ldap
+
+[logger_kazoo_client]
+level=INFO
+handlers=errorlog
+qualname=kazoo.client
+
+[logger_djangosaml2]
+level=INFO
+handlers=errorlog
+qualname=djangosaml2
+
+[logger_requests_packages_urllib3_connectionpool]
+level=DEBUG
+handlers=errorlog
+qualname=requests.packages.urllib3.connectionpool
+
+[logger_django_db]
+level=DEBUG
+handlers=errorlog
+qualname=django.db.backends
+
+[logger_boto]
+level=ERROR
+handlers=errorlog
+qualname=boto
+
+[handler_stderr]
+class=StreamHandler
+formatter=default
+level=DEBUG
+args=(sys.stderr,)
 
 
 [handler_logfile]
 [handler_logfile]
+class=handlers.SocketHandler
 level=DEBUG
 level=DEBUG
+formatter=default
+args=('%LOG_DIR%/hue.uds',None,)
+
+[handler_accesslog]
+class=handlers.SocketHandler
+level=INFO
+propagate=True
+formatter=access
+args=('%LOG_DIR%/hue.uds',None,)
+
+[handler_errorlog]
 class=handlers.SocketHandler
 class=handlers.SocketHandler
+level=ERROR
 formatter=default
 formatter=default
 args=('%LOG_DIR%/hue.uds',None,)
 args=('%LOG_DIR%/hue.uds',None,)
 
 
@@ -23,14 +76,20 @@ class=desktop.log.formatter.Formatter
 format=[%(asctime)s] %(module)-12s %(levelname)-8s %(message)s
 format=[%(asctime)s] %(module)-12s %(levelname)-8s %(message)s
 datefmt=%d/%b/%Y %H:%M:%S %z
 datefmt=%d/%b/%Y %H:%M:%S %z
 
 
+[formatter_access]
+class=desktop.log.formatter.Formatter
+format=[%(asctime)s] %(levelname)-8s %(message)s
+datefmt=%d/%b/%Y %H:%M:%S %z
+
 ########################################
 ########################################
 # A summary of loggers, handlers and formatters
 # A summary of loggers, handlers and formatters
 ########################################
 ########################################
+
 [loggers]
 [loggers]
-keys=root
+keys=root,access,django_auth_ldap,kazoo_client,requests_packages_urllib3_connectionpool,djangosaml2,django_db,boto
 
 
 [handlers]
 [handlers]
-keys=logfile
+keys=stderr,logfile,accesslog,errorlog
 
 
 [formatters]
 [formatters]
-keys=default
+keys=default,access

+ 17 - 32
desktop/conf/gunicorn_log.conf

@@ -11,92 +11,77 @@
 ########################################
 ########################################
 
 
 [logger_root]
 [logger_root]
+level=NOTSET
 handlers=logfile,errorlog
 handlers=logfile,errorlog
 
 
 [logger_access]
 [logger_access]
+level=NOTSET
 handlers=accesslog
 handlers=accesslog
 qualname=access
 qualname=access
 
 
 [logger_django_auth_ldap]
 [logger_django_auth_ldap]
+level=NOTSET
 handlers=accesslog
 handlers=accesslog
 qualname=django_auth_ldap
 qualname=django_auth_ldap
 
 
 [logger_kazoo_client]
 [logger_kazoo_client]
-level=INFO
+level=NOTSET
 handlers=errorlog
 handlers=errorlog
 qualname=kazoo.client
 qualname=kazoo.client
 
 
 [logger_djangosaml2]
 [logger_djangosaml2]
-level=INFO
+level=NOTSET
 handlers=errorlog
 handlers=errorlog
 qualname=djangosaml2
 qualname=djangosaml2
 
 
 [logger_requests_packages_urllib3_connectionpool]
 [logger_requests_packages_urllib3_connectionpool]
-level=DEBUG
+level=NOTSET
 handlers=errorlog
 handlers=errorlog
 qualname=requests.packages.urllib3.connectionpool
 qualname=requests.packages.urllib3.connectionpool
 
 
 [logger_django_db]
 [logger_django_db]
-level=DEBUG
+level=NOTSET
 handlers=errorlog
 handlers=errorlog
 qualname=django.db.backends
 qualname=django.db.backends
 
 
 [logger_boto]
 [logger_boto]
-level=ERROR
+level=NOTSET
 handlers=errorlog
 handlers=errorlog
 qualname=boto
 qualname=boto
 
 
-[logger_gunicorn.error]
-level=INFO
-handlers=errorlog
-propagate=1
-qualname=gunicorn.error
-
-[logger_gunicorn.access]
-level=INFO
-handlers=accesslog
-propagate=0
-qualname=gunicorn.access
-
 [handler_stderr]
 [handler_stderr]
 class=StreamHandler
 class=StreamHandler
 formatter=default
 formatter=default
-level=DEBUG
+level=NOTSET
 args=(sys.stderr,)
 args=(sys.stderr,)
 
 
-[handler_stdout]
-class=StreamHandler
-formatter=default
-level=DEBUG
-args=(sys.stdout,)
-
 [handler_accesslog]
 [handler_accesslog]
 class=handlers.RotatingFileHandler
 class=handlers.RotatingFileHandler
-level=INFO
+level=NOTSET
 propagate=True
 propagate=True
 formatter=access
 formatter=access
 args=('%LOG_DIR%/access.log', 'a', 5000000, 5)
 args=('%LOG_DIR%/access.log', 'a', 5000000, 5)
 
 
 [handler_errorlog]
 [handler_errorlog]
 class=handlers.RotatingFileHandler
 class=handlers.RotatingFileHandler
-level=ERROR
+level=NOTSET
 formatter=default
 formatter=default
 args=('%LOG_DIR%/error.log', 'a', 5000000, 5)
 args=('%LOG_DIR%/error.log', 'a', 5000000, 5)
 
 
 [handler_logfile]
 [handler_logfile]
 class=handlers.RotatingFileHandler
 class=handlers.RotatingFileHandler
 # Choices are DEBUG, INFO, WARNING, ERROR, CRITICAL
 # Choices are DEBUG, INFO, WARNING, ERROR, CRITICAL
-level=DEBUG
+level=NOTSET
 formatter=default
 formatter=default
 args=('%LOG_DIR%/rungunicornserver.log', 'a', 5000000, 5)
 args=('%LOG_DIR%/rungunicornserver.log', 'a', 5000000, 5)
 
 
 [formatter_default]
 [formatter_default]
-class=logging.Formatter
+class=desktop.log.formatter.Formatter
 format=[%(asctime)s] %(module)-12s %(levelname)-8s %(message)s
 format=[%(asctime)s] %(module)-12s %(levelname)-8s %(message)s
 datefmt=%d/%b/%Y %H:%M:%S %z
 datefmt=%d/%b/%Y %H:%M:%S %z
 
 
 [formatter_access]
 [formatter_access]
-class=logging.Formatter
+class=desktop.log.formatter.Formatter
 format=[%(asctime)s] %(levelname)-8s %(message)s
 format=[%(asctime)s] %(levelname)-8s %(message)s
 datefmt=%d/%b/%Y %H:%M:%S %z
 datefmt=%d/%b/%Y %H:%M:%S %z
 
 
@@ -106,10 +91,10 @@ datefmt=%d/%b/%Y %H:%M:%S %z
 ########################################
 ########################################
 
 
 [loggers]
 [loggers]
-keys=root,access,django_auth_ldap,kazoo_client,requests_packages_urllib3_connectionpool,djangosaml2,django_db,boto,gunicorn.error,gunicorn.access
+keys=root,access,django_auth_ldap,kazoo_client,requests_packages_urllib3_connectionpool,djangosaml2,django_db,boto
 
 
 [handlers]
 [handlers]
-keys=stderr,logfile,accesslog,errorlog,stdout
+keys=stderr,logfile,accesslog,errorlog
 
 
 [formatters]
 [formatters]
-keys=default,access
+keys=default,access

+ 63 - 4
desktop/conf/log.conf

@@ -9,12 +9,65 @@
 # Developers may set the DESKTOP_DEBUG environment variable to
 # Developers may set the DESKTOP_DEBUG environment variable to
 # enable stderr logging output.
 # enable stderr logging output.
 ########################################
 ########################################
+
 [logger_root]
 [logger_root]
-handlers=logfile
+handlers=logfile,errorlog
+
+[logger_access]
+handlers=accesslog
+qualname=access
+
+[logger_django_auth_ldap]
+handlers=accesslog
+qualname=django_auth_ldap
+
+[logger_kazoo_client]
+level=INFO
+handlers=errorlog
+qualname=kazoo.client
+
+[logger_djangosaml2]
+level=INFO
+handlers=errorlog
+qualname=djangosaml2
+
+[logger_requests_packages_urllib3_connectionpool]
+level=DEBUG
+handlers=errorlog
+qualname=requests.packages.urllib3.connectionpool
+
+[logger_django_db]
+level=DEBUG
+handlers=errorlog
+qualname=django.db.backends
+
+[logger_boto]
+level=ERROR
+handlers=errorlog
+qualname=boto
+
+[handler_stderr]
+class=StreamHandler
+formatter=default
+level=DEBUG
+args=(sys.stderr,)
 
 
 [handler_logfile]
 [handler_logfile]
+class=handlers.SocketHandler
 level=DEBUG
 level=DEBUG
+formatter=default
+args=('%LOG_DIR%/hue.uds',None,)
+
+[handler_accesslog]
+class=handlers.SocketHandler
+level=INFO
+propagate=True
+formatter=access
+args=('%LOG_DIR%/hue.uds',None,)
+
+[handler_errorlog]
 class=handlers.SocketHandler
 class=handlers.SocketHandler
+level=ERROR
 formatter=default
 formatter=default
 args=('%LOG_DIR%/hue.uds',None,)
 args=('%LOG_DIR%/hue.uds',None,)
 
 
@@ -23,14 +76,20 @@ class=desktop.log.formatter.Formatter
 format=[%(asctime)s] %(module)-12s %(levelname)-8s %(message)s
 format=[%(asctime)s] %(module)-12s %(levelname)-8s %(message)s
 datefmt=%d/%b/%Y %H:%M:%S %z
 datefmt=%d/%b/%Y %H:%M:%S %z
 
 
+[formatter_access]
+class=desktop.log.formatter.Formatter
+format=[%(asctime)s] %(levelname)-8s %(message)s
+datefmt=%d/%b/%Y %H:%M:%S %z
+
 ########################################
 ########################################
 # A summary of loggers, handlers and formatters
 # A summary of loggers, handlers and formatters
 ########################################
 ########################################
+
 [loggers]
 [loggers]
-keys=root
+keys=root,access,django_auth_ldap,kazoo_client,requests_packages_urllib3_connectionpool,djangosaml2,django_db,boto
 
 
 [handlers]
 [handlers]
-keys=logfile
+keys=stderr,logfile,accesslog,errorlog
 
 
 [formatters]
 [formatters]
-keys=default
+keys=default,access