Merge remote-tracking branch 'ravi/cleanup' into add_rabbitmq_connection

Conflicts:
	run.py

app/__init__.py

@@ -17,10 +17,6 @@ def create_app(config_name):
     @app.route('/', methods=['GET', 'POST']) # initial route to display the reg page
     def index():
 
-        #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())
 
@@ -28,7 +24,6 @@ def create_app(config_name):
             session['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)

app/templates/auth/SignUp.html

@@ -10,9 +10,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 ) {

run.py

@@ -17,20 +17,10 @@ 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')
 
-
-@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('connect')
+def socket_connect():
+    pass
 
 @socketio.on('join_room')
 def on_room():
@@ -43,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)
@@ -58,5 +43,4 @@ def request_account(json, methods=['GET', 'POST']):
 
 
 if __name__ == '__main__':
-   # app.run()
     socketio.run(app, host='0.0.0.0')

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)
-