From 3995828d2a97202d6e86a2eb7ebd9e4b78c859e5 Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Fri, 13 Mar 2020 09:24:44 -0500
Subject: [PATCH 1/4] added vars file to be used by run.py and tasks.py
---
run.py | 5 +++--
tasks.py | 5 +++--
vars.py | 3 +++
3 files changed, 9 insertions(+), 4 deletions(-)
create mode 100644 vars.py
diff --git a/run.py b/run.py
index 2bc594c..6f6065a 100644
--- a/run.py
+++ b/run.py
@@ -4,6 +4,7 @@ import os
import time
import signal
import tasks
+import vars
from flask import session
from flask_socketio import SocketIO, join_room
@@ -15,8 +16,8 @@ monkey.patch_all(subprocess=True)
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')
+app.config['SECRET_KEY'] = vars.key
+socketio = SocketIO(app, message_queue= vars.message_queue)
@socketio.on('connect')
def socket_connect():
diff --git a/tasks.py b/tasks.py
index f596d1d..e380c9c 100644
--- a/tasks.py
+++ b/tasks.py
@@ -2,14 +2,15 @@ from celery import Celery
import time
from flask_socketio import SocketIO
import subprocess
+import vars
from gevent import monkey
monkey.patch_all(subprocess=True)
-broker_url = 'amqp://reggie:reggie@ohpc:5672/'
+broker_url = vars.broker_url
celery = Celery('flask_user_reg', broker=broker_url)
-socketio = SocketIO(message_queue='amqp://reggie:reggie@ohpc:5672/socketio')
+socketio = SocketIO(message_queue=vars.message_queue)
def send_msg(event, room):
print("Post '{}' to room '{}'".format(event,room))
diff --git a/vars.py b/vars.py
new file mode 100644
index 0000000..9fd2cba
--- /dev/null
+++ b/vars.py
@@ -0,0 +1,3 @@
+Key = 'vnkdjnfjknfl1232'
+broker_url = 'amqp://reggie:reggie@ohpc:5672/'
+message_queue = broker_url + 'socketio'
--
GitLab
From 9b5939724a887bc008ce6a0e870c07d0ee689464 Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Fri, 13 Mar 2020 09:43:53 -0500
Subject: [PATCH 2/4] fixed type Key to key
---
vars.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/vars.py b/vars.py
index 9fd2cba..3125e1d 100644
--- a/vars.py
+++ b/vars.py
@@ -1,3 +1,4 @@
-Key = 'vnkdjnfjknfl1232'
+
+key = 'vnkdjnfjknfl1232'
broker_url = 'amqp://reggie:reggie@ohpc:5672/'
message_queue = broker_url + 'socketio'
--
GitLab
From 1c4d28b5de4f33b6eeb60099b501fb111f2bac08 Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Fri, 13 Mar 2020 09:47:17 -0500
Subject: [PATCH 3/4] added username and password as variables
---
vars.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/vars.py b/vars.py
index 3125e1d..d09f911 100644
--- a/vars.py
+++ b/vars.py
@@ -1,4 +1,6 @@
-
+id = 'reggie'
+password = 'reggie'
key = 'vnkdjnfjknfl1232'
-broker_url = 'amqp://reggie:reggie@ohpc:5672/'
+broker_url = 'amqp://' + id + ':' + password + '@ohpc:5672/'
+print broker_url
message_queue = broker_url + 'socketio'
--
GitLab
From 712d5d8a34816bbd42e7f9053be53a8eb07885bb Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Fri, 13 Mar 2020 09:50:03 -0500
Subject: [PATCH 4/4] removed print statemt
---
vars.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/vars.py b/vars.py
index d09f911..6d94b57 100644
--- a/vars.py
+++ b/vars.py
@@ -2,5 +2,4 @@ id = 'reggie'
password = 'reggie'
key = 'vnkdjnfjknfl1232'
broker_url = 'amqp://' + id + ':' + password + '@ohpc:5672/'
-print broker_url
message_queue = broker_url + 'socketio'
--
GitLab