Merge branch 'develop' of git://github.com/id-python/members into develop

Author: iromli

users/__init__.py

@@ -14,6 +14,11 @@
 from users.database import db, migrate
 
 
+APP = Flask(__name__)
+# Load configuration from any possible means.
+AppConfig(APP, default_settings="users.default_config")
+
+
 def add_handler_once(logger, handler):
     """A helper to add a handler to a logger, ensuring there are no duplicates.
 
@@ -45,12 +50,12 @@ def setup_logger():
     # create formatter that will be added to the handlers
     formatter = logging.Formatter(
         '%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-    temp_dir = '/tmp'
+    log_dir = APP.config['LOG_DIR']
     # so e.g. jenkins can override log dir.
     if 'USER_MAP_LOGFILE' in os.environ:
         file_name = os.environ['USER_MAP_LOGFILE']
     else:
-        file_name = os.path.join(temp_dir, 'user-map.log')
+        file_name = os.path.join(log_dir, 'user-map.log')
     file_handler = logging.FileHandler(file_name)
     file_handler.setLevel(handler_level)
     # create console handler with a higher log level
@@ -68,10 +73,6 @@ def setup_logger():
 setup_logger()
 LOGGER = logging.getLogger('user_map')
 
-APP = Flask(__name__)
-
-# Load configuration from any possible means.
-AppConfig(APP, default_settings="users.default_config")
 
 # Mailer
 mail = Mail(APP)

users/default_config.py

@@ -48,6 +48,9 @@
     shadow='/static/img/marker-shadow.png'
 )
 
+# Directory location for log file
+LOG_DIR = '/tmp'
+
 # By default it uses postgres, hence you'll need to ``psycopg2``.
 # If you're using MySQL, refer to
 # http://docs.sqlalchemy.org/en/rel_0_9/core/engines.html