Merge lp:~bloodearnest/canonical-identity-provider/hi-fi-logging into lp:canonical-identity-provider/release

[Simon Davy]

Use the new logging library, talisker:

https://code.launchpad.net/~bloodearnest/+junk/talisker

This library aims to standardise logging across our services, as well as provide structured logging. It does the following

 - a standard log format
 - arbitrary key=value pairs
 - log to stderr, for the charm to handle files, directories and perms, etc (12 factor app)

This change:

 - uses the gunicorn wrapper for make run, which sets up logging
 - disable django's default logging, as it's not needed any more (and has bad production defaults, see https://docs.djangoproject.com/en/1.8/topics/logging/#default-logging-configuration )

[lp:~bloodearnest/canonical-identity-provider/hi-fi-logging]

1399. By Simon Davy on 2016-02-23

clean up whitespace

[Simon Davy (bloodearnest)]

On Tue, Feb 23, 2016 at 4:34 PM, Maximiliano Bertacchini
<email address hidden> wrote:
>
>
> Diff comments:
>
>> === modified file 'Makefile'
>> --- Makefile 2016-01-21 15:45:34 +0000
>> +++ Makefile 2016-02-23 10:59:30 +0000
>> @@ -151,7 +151,7 @@
>>
>> run: ARGS=0.0.0.0:8000
>> run:
>> - $(ENV)/bin/gunicorn django_project.wsgi:application --workers=2 --reload --pid=logs/gunicorn.pid --bind=$(ARGS) --timeout=99999 --error-logfile=- --access-logfile=-
>> + $(ENV)/bin/talisker_gunicorn sso --devel -- django_project.wsgi:application --reload --pid logs/gunicorn.pid --access-logfile - --timeout 99999 --workers 2 --bind=$(ARGS)
>
> Is the --devel flag necessary?

For that makefile rule, yes. The defaults are production orientated,
and thus silence python's warning system (which is also what django's
default logging did before). --devel logs the warnings, which is what
we want in development, when this make target is designed to be used.

Thanks

--
Simon

Unmerged revisions

1399. By Simon Davy on 2016-02-23

clean up whitespace

1398. By Simon Davy on 2016-02-23

use explicit gunicorn version

1397. By Simon Davy on 2016-02-22

merging

1396. By Simon Davy on 2016-02-22

Remove manual wsgi wrapping

1395. By Simon Davy on 2016-02-10

merging

1394. By Simon Davy on 2016-02-10

Use new talisker runner

1393. By Simon Davy on 2016-01-27

basic talisker integration

1392. By Simon Davy on 2016-01-21

merging

1391. By Simon Davy on 2016-01-13

fix timezone formatting in access logger

1390. By Simon Davy on 2016-01-13

merging

=== modified file 'Makefile'
--- Makefile	2016-01-21 15:45:34 +0000
+++ Makefile	2016-02-23 10:59:30 +0000
@@ -151,7 +151,7 @@
 
 run: ARGS=0.0.0.0:8000
 run:
-	$(ENV)/bin/gunicorn django_project.wsgi:application --workers=2 --reload --pid=logs/gunicorn.pid --bind=$(ARGS) --timeout=99999 --error-logfile=- --access-logfile=- 
+	$(ENV)/bin/talisker_gunicorn sso --devel -- django_project.wsgi:application --reload --pid logs/gunicorn.pid --access-logfile - --timeout 99999 --workers 2  --bind=$(ARGS)
 
 start: bootstrap start-db
 

=== modified file 'django_project/settings_base.py'
--- django_project/settings_base.py	2016-01-27 12:00:39 +0000
+++ django_project/settings_base.py	2016-02-23 10:59:30 +0000
@@ -318,52 +318,7 @@
 LOCALE_PATHS = [
     os.path.join(BASE_DIR, 'branches/translations/locale'),
 ]
-LOGGING = {
-    'disable_existing_loggers': False,
-    'filters': {},
-    'formatters': {
-        'simple': {
-            'datefmt': None,
-            'format': '%(asctime)s %(levelname)s %(name)s %(message)s',
-        },
-        'verbose': {
-            'datefmt': None,
-            'format': ('%(asctime)s %(levelname)s %(module)s %(process)d '
-                       '%(thread)d %(message)s'),
-        },
-    },
-    'handlers': {
-        'file': {
-            'filename': os.path.join(LOGS_DIR, 'sso.log'),
-            'formatter': 'simple',
-            'class': 'logging.FileHandler',
-            'filters': '',
-            'level': 'INFO',
-        },
-    },
-    'incremental': False,
-    'loggers': {
-        'sso': {
-            'level': 'INFO',
-            'propagate': False,
-            'filters': [],
-            'handlers': ['file'],
-        },
-        'django': {
-            'level': 'INFO',
-            'propagate': False,
-            'filters': [],
-            'handlers': ['file'],
-        },
-    },
-    'root': {
-        'level': 'INFO',
-        'filters': [],
-        'handlers': ['file'],
-    },
-    'version': 1,
-}
-LOGGING_CONFIG = 'django.utils.log.dictConfig'
+LOGGING_CONFIG = None
 LOGIN_REDIRECT_URL = '/'
 LOGIN_URL = '/+login'
 LOGOUT_URL = '/accounts/logout/'

=== modified file 'requirements.txt'
--- requirements.txt	2016-02-01 15:30:36 +0000
+++ requirements.txt	2016-02-23 10:59:30 +0000
@@ -10,7 +10,6 @@
 django-secure==1.0.1
 django-statsd-mozilla==0.3.15
 gargoyle==0.11.0
-gunicorn==19.3.0
 lazr.authentication==0.1.3
 nexus==0.3.1
 oath==1.4.0
@@ -29,3 +28,8 @@
 timeline==0.0.4
 timeline-django==0.0.4
 whitenoise==2.0.6
+
+# temporary talisker deps
+talisker==0.1.0
+gunicorn==19.4.5.dev1.690b11e
+