From 39dbcc97fb0900fd0158d2a4efcdf19e090f3cc8 Mon Sep 17 00:00:00 2001
From: Mitchell Moore <mmoo97@uab.edu>
Date: Mon, 2 Mar 2020 12:38:28 -0600
Subject: [PATCH] Fixed variable in run.py. Updated Readme
- Fix var in run.py
- add image resource
- Update readme
- Remove old diagram
---
README.md | 2 +-
app/__init__.py | 9 ++-------
run.py | 3 ---
3 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
index a58d15f..fe85751 100644
--- a/README.md
+++ b/README.md
@@ -68,4 +68,4 @@ $ python test_producer.py ohpc
You should now see that the message has been sent and displayed on the ohpc node.
- **Note,** that the `test_producer.py` script is identical to the code within the `ingest_data()` function in `run.py`.
-
\ No newline at end of file
+
diff --git a/app/__init__.py b/app/__init__.py
index 2d31e68..2343984 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -14,19 +14,14 @@ def create_app(config_name):
app = Flask(__name__) # initialization of the flask app
Bootstrap(app) # allowing app to use bootstrap
- global return_url
- return_url = ''
-
@app.route('/', methods=['GET', 'POST']) # initial route to display the reg page
def index():
- global return_url
if 'uid' not in session:
session['uid']=str(uuid.uuid4())
- if "redir" in request.args and return_url == "": # check for redir arg in url
- return_url = request.args.get("redir") or "/pun/sys/dashboard"
- if name != "":
+ if "redir" in request.args and 'return_url' not in session: # check for redir arg in url
+ session['return_url'] = request.args.get("redir") or "/pun/sys/dashboard"
return render_template('auth/SignUp.html', room_id=session['uid'])
diff --git a/run.py b/run.py
index 2bc594c..5b864f9 100644
--- a/run.py
+++ b/run.py
@@ -18,9 +18,6 @@ app = create_app(config_name)
app.config['SECRET_KEY'] = 'vnkdjnfjknfl1232#'
socketio = SocketIO(app, message_queue='amqp://reggie:reggie@ohpc:5672/socketio')
-@socketio.on('connect')
-def socket_connect():
- pass
@socketio.on('join_room')
def on_room():
--
GitLab