Script and logging cleanup

manage.py

@@ -5,7 +5,7 @@
 '''
 from __future__ import unicode_literals
 
-from udata.commands import get_manager
+from udata.commands import run_manager
 
 if __name__ == '__main__':
-    get_manager().run()
+    run_manager('udata.settings.Debug')

requirements/install.pip

@@ -6,7 +6,6 @@ elasticsearch==1.0.0
 Flask==0.10.1
 Flask-BabelEx==0.9.1
 Flask-Cache==0.13.1
-Flask-Collect==0.2.3
 Flask-Gravatar==0.4.1
 Flask-Login==0.2.10
 Flask-Mail==0.9.0

udata/app.py

@@ -21,14 +21,16 @@
 
 
 class UDataApp(Flask):
+    debug_log_format = '[%(levelname)s][%(name)s:%(lineno)d] %(message)s'
+
     def send_static_file(self, filename):
         '''
         Override default static handling:
         - raises 404 if not debug
         - handle static aliases
         '''
         if not self.debug:
-            self.logger.error('not debug')
+            self.logger.error('Static files are only served in debug')
             abort(404)
 
         cache_timeout = self.get_send_file_max_age(filename)
@@ -94,12 +96,8 @@ def standalone(app):
 
 
 def init_logging(app):
-    logging.getLogger('').addHandler(logging.NullHandler())
     log_level = logging.DEBUG if app.debug else logging.WARNING
     app.logger.setLevel(log_level)
-    # logging.getLogger('udata').setLevel(log_level)
-    logging.getLogger('werkzeug').setLevel(log_level)
-    logging.getLogger('celery.task').setLevel(log_level)
     loggers = [
         logging.getLogger('elasticsearch'),
         logging.getLogger('requests')

udata/commands/__init__.py

@@ -8,32 +8,21 @@
 
 from flask.ext.script import Manager
 from flask.ext.script.commands import Clean, ShowUrls, Server
-from flask.ext.collect import Collect
 
 
 from udata.app import create_app, standalone
 from udata.core import MODULES
 
 log = logging.getLogger(__name__)
 
-collect = Collect()
-
-
-def factory(config):
-    app = create_app(config)
-    app = standalone(app)
-    collect.init_app(app)
-    return app
-
-manager = Manager(factory)
+manager = Manager()
 
 
 def register_commands(manager):
     '''Register all core commands'''
-    collect.init_script(manager)
     manager.add_command('clean', Clean())
     manager.add_command('urls', ShowUrls())
-    manager.add_command('serve', Server(port=6666))
+    manager.add_command('serve', Server(port=6666, use_debugger=True, use_reloader=True))
 
     # Load all commands submodule
     for filename in iglob(join(dirname(__file__), '[!_]*.py')):
@@ -53,9 +42,7 @@ def register_commands(manager):
             log.error('Error importing %s commands: %s', module, e)
 
     # Dynamic module commands loading
-    # FIXME: Create app here to access config
-    app = create_app()
-    for plugin in app.config['PLUGINS']:
+    for plugin in manager.app.config['PLUGINS']:
         name = 'udata.ext.{0}.commands'.format(plugin)
         try:
             __import__(name)
@@ -65,11 +52,13 @@ def register_commands(manager):
             log.error('Error importing %s: %s', name, e)
 
 
-def get_manager(default_config='udata.settings.Debug'):
-    manager.add_option('-c', '--config', dest='config', default=default_config, required=False)
+def run_manager(config='udata.settings.Defaults'):
+    app = create_app(config)
+    app = standalone(app)
+    manager.app = app
     register_commands(manager)
-    return manager
+    manager.run()
 
 
 def console_script():
-    get_manager('udata.settings.Defaults').run()
+    run_manager()

udata/core/followers/api.py

@@ -12,6 +12,9 @@
 
 
 class FollowAPI(API):
+    '''
+    Base Follow Model API.
+    '''
     model = Follow
 
     def post(self, id):

udata/models/__init__.py

@@ -70,7 +70,7 @@ def to_dict(self, exclude=None):
         for model in models.__all__:
             loc[model] = getattr(models, model)
     except ImportError as e:
-        log.debug('Error for %s: %s', module, e)
+        pass
     except Exception as e:
         log.error('Unable to import %s: %s', module, e)
 del loc