From 6dd7cc06bba672ee5fd80b34455c837a7c124269 Mon Sep 17 00:00:00 2001
From: Ravi Tripathi <ravi89@uab.edu>
Date: Wed, 4 Mar 2020 23:11:04 +0000
Subject: [PATCH] Add a new function to send socketio messages to the client,
and change the socketio message_queue to match the one from flask app
---
tasks.py | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/tasks.py b/tasks.py
index 9f63341..8eb674b 100644
--- a/tasks.py
+++ b/tasks.py
@@ -6,25 +6,28 @@ import subprocess
from gevent import monkey
monkey.patch_all(subprocess=True)
-broker_url = 'amqp://reggie:reggie@ohpc:5672/socketio'
+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):
-# socketio.emit(event, room=room)
+def send_msg(event, room):
+ print("Post '{}' to room '{}'".format(event,room))
+ socketio.emit(event, room=room)
@celery.task
-def celery_create_account(username, fullname, reason, room, socketio):
+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)
+ 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)
+ send_msg('account ready', room)
+ #socketio.emit('account ready', room=room)
--
GitLab