Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

app/__init__.py

@@ -1,6 +1,6 @@
 from config import config
 from flask import Flask
-from flask_apscheduler import APScheduler
+# from flask_apscheduler import APScheduler
 from flask_login import LoginManager
 from flask_mail import Mail
 from flask_socketio import SocketIO
@@ -11,7 +11,7 @@ db = SQLAlchemy()
 login_manager = LoginManager()
 login_manager.login_view = 'auth.login'
 mail = Mail()
-scheduler = APScheduler()
+# scheduler = APScheduler()
 socketio = SocketIO()
 
 

opaque.py

@@ -1,14 +1,7 @@
 import eventlet
-eventlet.monkey_patch(os=True,
-                      select=True,
-                      socket=True,
-                      thread=False,
-                      time=True,
-                      psycopg=True)
-
+eventlet.monkey_patch()
 from dotenv import load_dotenv
 load_dotenv()
-
 from app import create_app, db, socketio
 from app.models import Corpus, User, Role, Permission, Job
 from flask_migrate import Migrate
@@ -19,10 +12,6 @@ app = create_app(os.getenv('FLASK_CONFIG') or 'default')
 migrate = Migrate(app, db)
 
 
-if __name__ == '__main__':
-    socketio.run(app)
-
-
 @app.shell_context_processor
 def make_shell_context():
     return dict(db=db,
@@ -39,3 +28,7 @@ def test():
     import unittest
     tests = unittest.TestLoader().discover('tests')
     unittest.TextTestRunner(verbosity=2).run(tests)
+
+
+if __name__ == '__main__':
+    socketio.run(app)