From 366381d3203efeb914618db7b1ef365090bbb05f Mon Sep 17 00:00:00 2001
From: Travis Rivers <travrivers88@gmail.com>
Date: Tue, 17 Mar 2020 14:16:10 -0600
Subject: [PATCH] remove run files, update app.py file
---
geomagio/webservice/__init__.py | 3 +--
geomagio/webservice/{run_both.py => app.py} | 14 +++++++++-----
geomagio/webservice/public_app.py | 5 +----
geomagio/webservice/restricted_app.py | 7 ++-----
geomagio/webservice/run_public.py | 6 ------
geomagio/webservice/run_restricted.py | 6 ------
6 files changed, 13 insertions(+), 28 deletions(-)
rename geomagio/webservice/{run_both.py => app.py} (65%)
delete mode 100644 geomagio/webservice/run_public.py
delete mode 100644 geomagio/webservice/run_restricted.py
diff --git a/geomagio/webservice/__init__.py b/geomagio/webservice/__init__.py
index 51cf06e0..c101e5f8 100644
--- a/geomagio/webservice/__init__.py
+++ b/geomagio/webservice/__init__.py
@@ -1,7 +1,6 @@
from __future__ import absolute_import
-
-from .run_both import application
+from .app import create_app
__all__ = ["create_app"]
diff --git a/geomagio/webservice/run_both.py b/geomagio/webservice/app.py
similarity index 65%
rename from geomagio/webservice/run_both.py
rename to geomagio/webservice/app.py
index 5bd93e62..10d2cc30 100644
--- a/geomagio/webservice/run_both.py
+++ b/geomagio/webservice/app.py
@@ -4,11 +4,16 @@ from werkzeug.serving import run_simple
from .public_app import create_app as create_public_app
from .restricted_app import create_app as create_restricted_app
-public_app = create_public_app()
-restricted_app = create_restricted_app()
-# merge
-application = DispatcherMiddleware(public_app, {"/restricted": restricted_app})
+def create_app():
+ public_app = create_public_app()
+ restricted_app = create_restricted_app()
+ application = DispatcherMiddleware(public_app, {"/restricted": restricted_app})
+
+ return application
+
+
+application = create_app()
if __name__ == "__main__":
run_simple(
@@ -19,4 +24,3 @@ if __name__ == "__main__":
use_debugger=True,
use_evalex=True,
)
-
diff --git a/geomagio/webservice/public_app.py b/geomagio/webservice/public_app.py
index 9150b71b..beb3ba2e 100644
--- a/geomagio/webservice/public_app.py
+++ b/geomagio/webservice/public_app.py
@@ -3,9 +3,7 @@ from __future__ import absolute_import, unicode_literals
import os
import flask
-from . import data
-from . import database
-from . import login
+from . import data, login
def create_app():
@@ -14,7 +12,6 @@ def create_app():
app.config.update(os.environ)
# connect modules
- database.init_app(app)
login.init_app(app)
data.init_app(app)
diff --git a/geomagio/webservice/restricted_app.py b/geomagio/webservice/restricted_app.py
index d7a77871..27fcf880 100644
--- a/geomagio/webservice/restricted_app.py
+++ b/geomagio/webservice/restricted_app.py
@@ -3,9 +3,7 @@ from __future__ import absolute_import, unicode_literals
import os
import flask
-from . import data
-from . import database
-from . import login
+from . import database, login, session
def create_app():
@@ -16,7 +14,7 @@ def create_app():
# connect modules
database.init_app(app)
login.init_app(app)
- data.init_app(app)
+ session.init_app(app)
# add default route
@app.route("/")
@@ -24,4 +22,3 @@ def create_app():
return "<h1>Restricted Page</h1>"
return app
-
diff --git a/geomagio/webservice/run_public.py b/geomagio/webservice/run_public.py
deleted file mode 100644
index 4f3af36b..00000000
--- a/geomagio/webservice/run_public.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .public_app import create_app
-
-public_app = create_app()
-
-if __name__ == "__main__":
- public_app.run(host="0.0.0.0")
diff --git a/geomagio/webservice/run_restricted.py b/geomagio/webservice/run_restricted.py
deleted file mode 100644
index 9fc8d001..00000000
--- a/geomagio/webservice/run_restricted.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .restricted_app import create_app
-
-restricted_app = create_app()
-
-if __name__ == "__main__":
- restricted_app.run(host="0.0.0.0")
--
GitLab