From 9129b89e3b9b476b81a423338eaca3ce86de1d7b Mon Sep 17 00:00:00 2001
From: Ravi Tripathi <ravi89@uab.edu>
Date: Thu, 5 Mar 2020 19:34:10 +0000
Subject: [PATCH] Removing unused functions and commented out lines
---
run.py | 42 ------------------------------------------
1 file changed, 42 deletions(-)
diff --git a/run.py b/run.py
index 7f0f6f9..2bc594c 100644
--- a/run.py
+++ b/run.py
@@ -17,47 +17,11 @@ config_name = os.getenv('FLASK_CONFIG')
app = create_app(config_name)
app.config['SECRET_KEY'] = 'vnkdjnfjknfl1232#'
socketio = SocketIO(app, message_queue='amqp://reggie:reggie@ohpc:5672/socketio')
-#socketio = SocketIO(app)
-#socketio = SocketIO(app, message_queue='amqp:///socketio')
-
-# global username_global
-# global room_global
-
@socketio.on('connect')
def socket_connect():
pass
-def create_account(username, fullname, reason):
- # Todo: Ravi's and Louis's code goes here
- print (time.strftime("%m-%d-%Y_%H:%M:%S") + '\tUser ' + username + ' added to queue')
- socketio.emit("creating account", room=room_global)
- signal.signal(signal.SIGALRM, account_agent)
- signal.alarm(5)
-
-
-def account_agent(*args):
- # Todo: Code to create a consumer based on the username goes here
- # Todo: Goal is to have it listening for confirmation.
- username = session['username']
- room = str(session['uid'])
-
- print(time.strftime("%m-%d-%Y_%H:%M:%S") + '\tAccount successfully created for ' + username)
- socketio.emit("account ready", room=room)
- return True
-
-
-@socketio.on('user connected')
-def user_connected(json, methods=['GET', 'POST']):
-
- username = json["user"]
- room = str(session['uid'])
-
- join_room(room)
-
- print(time.strftime("%m-%d-%Y_%H:%M:%S") + '\tUser ' + username + ' connected.')
- print('\t\t\t|-----Room ID: ' + room)
-
@socketio.on('join_room')
def on_room():
@@ -69,14 +33,9 @@ def on_room():
@socketio.on('request account')
def request_account(json, methods=['GET', 'POST']):
print (time.strftime("%m-%d-%Y_%H:%M:%S") + '\tQueue request received: ' + str(json))
- #print(json)
sid = str(session['uid'])
- #join_room(room)
print("Room: {}".format(sid))
- #socketio.emit("creating account", room=sid)
try:
- # create_account(json['username'], json['fullname'], json['reason'])
- #tasks.celery_create_account.delay(json['username'], json['fullname'], json['reason'], room, socketio, session=room)
tasks.celery_create_account.delay(json['username'], json['fullname'], json['reason'], session=sid)
except Exception as e:
print(time.strftime("%m-%d-%Y_%H:%M:%S") + "\tError in account creation: ", e)
@@ -84,5 +43,4 @@ def request_account(json, methods=['GET', 'POST']):
if __name__ == '__main__':
- # app.run()
socketio.run(app, host='0.0.0.0')
--
GitLab