diff --git a/config/settings/base.py b/config/settings/base.py index 4725b549781ea5657e45950529279c52de9481f7..830bc433b0ea12be8bdd53553d6b77c864be984e 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -487,7 +487,14 @@ LOGGING = { 'format': '%(asctime)s.%(msecs)03d | %(name)s | %(levelname)s | ' \ + '%(filename)s, line %(lineno)s | %(message)s', 'datefmt': LOG_DATEFMT, - } + }, + 'console': { + 'format': ('%(asctime)s.%(msecs)03d | {host} | {ip} | %(name)s | ' + '%(levelname)s | %(filename)s, line %(lineno)s | ' + '%(message)s').format(host=INTERNAL_HOSTNAME, + ip=INTERNAL_IP_ADDRESS), + 'datefmt': LOG_DATEFMT, + }, }, 'handlers': { 'null': { @@ -520,7 +527,12 @@ LOGGING = { 'mail_admins': { 'level': 'ERROR', 'class': 'django.utils.log.AdminEmailHandler' - } + }, + 'console': { + 'class': 'logging.StreamHandler', + 'formatter': 'console', + 'level': 'DEBUG', + }, }, 'loggers': { 'django': { diff --git a/config/settings/container/base.py b/config/settings/container/base.py index 0301054797f552cc70aa7d242f108f75f72342c5..6fa5b956bcaf98d92d574f94a4b0f685af0299a4 100644 --- a/config/settings/container/base.py +++ b/config/settings/container/base.py @@ -106,3 +106,7 @@ EMBB_MAIL_ADDRESS = 'embb@{fqdn}.ligo.org'.format(fqdn=SERVER_FQDN) EMBB_SMTP_SERVER = 'localhost' EMBB_MAIL_ADMINS = [admin[1] for admin in ADMINS] EMBB_IGNORE_ADDRESSES = ['Mailer-Daemon@{fqdn}'.format(fqdn=SERVER_FQDN)] + +# Set up logging to stdout only +for key in LOGGING['loggers']: + LOGGING['loggers'][key]['handlers'] = ['console'] diff --git a/docker/supervisord-apache2.conf b/docker/supervisord-apache2.conf index 7e4523d7c7dd61cef8097c839c9e6deca4adee9a..0ae47cd8506dee4b16424f2b5cd0d29c159f1736 100644 --- a/docker/supervisord-apache2.conf +++ b/docker/supervisord-apache2.conf @@ -6,7 +6,7 @@ redirect_stderr=true priority=3 [program:gracedb] -command=/usr/local/bin/gunicorn config.wsgi:application --reload --config /app/gracedb_project/config/gunicorn_config.py +command=/usr/local/bin/gunicorn config.wsgi:application --reload --config /app/gracedb_project/config/gunicorn_config.py --error-logfile='-' --access-logfile='-' directory=/app/gracedb_project user=gracedb group=www-data