Merge lp:~facundo/magicicada-server/better-settings-local into lp:magicicada-server

[Facundo Batista]

Better handling of broken local settings, and allow changing values.

Better handling of broken local settings, and allow changing values.

IOW, I converted the simple "import local and pass if broken" to the following sequence:

- try to import * from local settings

- if broken, inform how!

- if all went ok, also try to import a pre-defined function

- if the function is not there, just pass (it's ok, this new function is optional)

- if the function is there, execute it.

The idea of this new function is to allow the local settings to *modify* a generic settings (not only overwrite it). For an example of how this would be useful, check what I'm doing in my local settings: http://linkode.org/RRo7cFNKgY95YeZyP4b3r6

[Natalia Bidart (nataliabidart)]

Hum, I really really don't like the fix_settings function. But if you feel very strong about it, could you please at least call it "override_settings"?

For needs like this, what I would propose is using a more "traditional" approach with env vars. Something like:

* in magicicada/settings/__init__.py:

    173 LOGGING = {
    ...
    204 'loggers': {
    205 'django': {
    206 'handlers': ['file'],
    207 'level': os.getenv('MAGICICADA_LOG_LEVEL', 'INFO'),
    208 'propagate': True,
    209 },
    ...
    221 }

And then just export the env var to the value you desire, or execute the server with:

MAGICICADA_LOG_LEVEL=DEBUG make start

Or alternatively, we could define a "debug" policy, a little big more "global", such as this:

LOG_LEVEL = 'INFO' if bool(os.getenv('MAGICICADA_DEBUG', None)) else 'DEBUG'
    173 LOGGING = {
    ...
    204 'loggers': {
    205 'django': {
    206 'handlers': ['file'],
    207 'level': LOG_LEVEL,
    208 'propagate': True,
    209 },
    ...
    221 }

What do you think?

[lp:~facundo/magicicada-server/better-settings-local]

84. By Facundo Batista on 2017-06-28

Better log level setting.

[Facundo Batista (facundo)]

Fixed as suggested

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'magicicada/settings/__init__.py'
--- magicicada/settings/__init__.py	2017-04-22 21:07:36 +0000
+++ magicicada/settings/__init__.py	2017-06-28 01:37:23 +0000
@@ -1,5 +1,5 @@
 # Copyright 2008-2015 Canonical
-# Copyright 2015-2016 Chicharreros (https://launchpad.net/~chicharreros)
+# Copyright 2015-2017 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -27,7 +27,7 @@
 https://docs.djangoproject.com/en/1.8/ref/settings/
 """
 
-from __future__ import unicode_literals
+from __future__ import unicode_literals, print_function
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import logging
@@ -204,12 +204,12 @@
     'loggers': {
         'django': {
             'handlers': ['file'],
-            'level': 'INFO',
+            'level': os.getenv('MAGICICADA_LOG_LEVEL', 'INFO'),
             'propagate': True,
         },
         'magicicada.server': {
             'handlers': ['server'],
-            'level': 'DEBUG',
+            'level': os.getenv('MAGICICADA_LOG_LEVEL', 'DEBUG'),
             'propagate': False,
         },
         'magicicada.metrics': {
@@ -263,5 +263,5 @@
 
 try:
     from magicicada.settings.local import *  # noqa
-except ImportError:
-    pass
+except ImportError as err:
+    print("ERROR importing local settings:", err)