diff --git a/README.md b/README.md index a58d15fb4cf0e1324ebeb9d272abb11361e7c1f7..fe85751dc194c1d5e8d3a6969dddc8089a290f7e 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 2d31e680b88318aa7e888fa77493dea7fa9f43e6..23439845aaa857574243ca1486b807eb9f47aa33 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 2bc594c736cf22caaa73dbb0598f999f477479a1..5b864f95e9da61c3fccfafe0e230224a6c2a587d 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():