From 95352a2b94cc31df26c9c7006d5ba921949345cc Mon Sep 17 00:00:00 2001
From: Ravi Tripathi <ravi89@uab.edu>
Date: Thu, 5 Mar 2020 19:35:26 +0000
Subject: [PATCH] Removing unused functions and commented out lines
---
app/__init__.py | 5 -----
app/templates/auth/SignUp.html | 3 ---
tasks.py | 7 -------
3 files changed, 15 deletions(-)
diff --git a/app/__init__.py b/app/__init__.py
index aa6e838..24841ea 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -21,10 +21,6 @@ def create_app(config_name):
def index():
global return_url
- #if 'username' not in session:
- # session['username'] = "name_test" + str(random.randint(0, 10000))
- # #session['username'] = session['bid']
-
if 'uid' not in session:
session['uid']=str(uuid.uuid4())
@@ -32,7 +28,6 @@ def create_app(config_name):
return_url = request.args.get("redir") or "/pun/sys/dashboard"
return render_template('auth/SignUp.html', room_id=session['uid'])
- #return render_template('auth/SignUp.html', user=session['username'], room_id=session['uid'])
# misc page error catching
@app.errorhandler(403)
diff --git a/app/templates/auth/SignUp.html b/app/templates/auth/SignUp.html
index ca165a1..8b109f4 100644
--- a/app/templates/auth/SignUp.html
+++ b/app/templates/auth/SignUp.html
@@ -11,9 +11,6 @@
var socket = io.connect('http://' + document.domain + ':' + location.port);
socket.on( 'connect', function() {
- /* socket.emit( 'user connected', {
- user: document.getElementById("username").innerText
- } ) */
socket.emit( 'join_room' )
socket.on( 'creating account', function( msg ) {
diff --git a/tasks.py b/tasks.py
index 8eb674b..f596d1d 100644
--- a/tasks.py
+++ b/tasks.py
@@ -7,10 +7,8 @@ from gevent import monkey
monkey.patch_all(subprocess=True)
broker_url = 'amqp://reggie:reggie@ohpc:5672/'
-#broker_url = 'amqp://'
celery = Celery('flask_user_reg', broker=broker_url)
-#socketio = SocketIO(message_queue='amqp:///socketio')
socketio = SocketIO(message_queue='amqp://reggie:reggie@ohpc:5672/socketio')
def send_msg(event, room):
@@ -20,14 +18,9 @@ def send_msg(event, room):
@celery.task
def celery_create_account(username, fullname, reason, session):
room = session
- # Todo: Ravi's and Louis's code goes here
print(time.strftime("%m-%d-%Y_%H:%M:%S") + '\tUser ' + username + ' added to queue')
send_msg('creating account', room)
- #socketio.emit("creating account", room=room)
print(username)
subprocess.call(["/opt/rabbitmq_agents/flask_producer.py", "ohpc_account_create", username])
- #time.sleep(5)
print(time.strftime("%m-%d-%Y_%H:%M:%S") + '\tAccount successfully created for ' + username)
send_msg('account ready', room)
- #socketio.emit('account ready', room=room)
-
--
GitLab