Refactoring part 1

Some changes for workers, but stopped due to refactoring

eveai_app/__init__.py

@@ -5,14 +5,13 @@ from flask_security import SQLAlchemyUserDatastore
 from flask_security.signals import user_authenticated
 from werkzeug.middleware.proxy_fix import ProxyFix
 import logging.config
-from celery import Celery
 
-from .extensions import db, migrate, bootstrap, security, mail, login_manager, cors
-from .models.user import User, Tenant, Role
-from .models.document import Document, DocumentLanguage, DocumentVersion
-from .logging_config import LOGGING
-from .utils.security import set_tenant_session_data
-from .worker.celery_utils import init_celery
+from common.extensions import db, migrate, bootstrap, security, mail, login_manager, cors
+from common.models.user import User, Role
+from config.logging_config import LOGGING
+from common.utils.security import set_tenant_session_data
+from .errors import register_error_handlers
+from eveai_workers.celery_utils import init_celery
 
 
 def create_app(config_file=None):
@@ -20,7 +19,7 @@ def create_app(config_file=None):
     app.wsgi_app = ProxyFix(app.wsgi_app, x_for=1)
 
     if config_file is None:
-        app.config.from_object('config.DevConfig')
+        app.config.from_object('config.config.DevConfig')
     else:
         app.config.from_object(config_file)
 
@@ -31,6 +30,10 @@ def create_app(config_file=None):
 
     logging.config.dictConfig(LOGGING)
     register_extensions(app)
+
+    # Initialize celery
+    init_celery(app)
+
     # Setup Flask-Security-Too
     user_datastore = SQLAlchemyUserDatastore(db, User, Role)
     security.init_app(app, user_datastore)
@@ -39,6 +42,10 @@ def create_app(config_file=None):
     # Register Blueprints
     register_blueprints(app)
 
+    # Register Error Handlers
+    register_error_handlers(app)
+
+    # Debugging settings
     if app.config['DEBUG'] is True:
         app.logger.setLevel(logging.DEBUG)
         mail_logger = logging.getLogger('flask_mailman')
@@ -79,17 +86,3 @@ def register_api(app):
     # from . import api
     # app.register_blueprint(api.bp, url_prefix='/api')
 
-
-def create_celery_app(config_file=None):
-    app = Flask(__name__)
-    if config_file is None:
-        app.config.from_object('config.DevConfig')
-    else:
-        app.config.from_object(config_file)
-
-    celery = Celery(app.import_name)
-    init_celery(celery, app)
-    return celery
-
-
-celery = create_celery_app()