From f872f1fe07d1074cfed8c3649450fc12ae5fdb64 Mon Sep 17 00:00:00 2001 From: Alex Orid Date: Thu, 13 May 2021 15:04:32 -0400 Subject: [PATCH] Reload Rewards Initial Commit --- standalone_eventLog.py | 33 +++++++++++++++++++++++++++++---- user_client/v1/webclient.js | 2 +- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/standalone_eventLog.py b/standalone_eventLog.py index 10b5613..f65fd39 100644 --- a/standalone_eventLog.py +++ b/standalone_eventLog.py @@ -20,9 +20,12 @@ import utilities_script as utility import chyron_module import timers_module +import requests import random import json +from json import loads +from urllib.parse import urlencode import base64 import event_logs.event_log_Module @@ -74,16 +77,38 @@ def get_events(): return flask.make_response("{\"message\":\"%s\"}" % payload.decode(), 200, {"Content-Type": "application/json"}) def reRunEvent_handler(eventName, eventTime, eventType, eventSender, eventData): - attempt_Event_Rerun(eventName, eventTime, eventType, eventSender, eventData) - return flask.make_response("{\"message\":\"%s\"}" % 'rerunning event....', 200, {"Content-Type": "application/json"}) + returnString = attempt_Event_Rerun(eventName, eventTime, eventType, eventSender, eventData) + return flask.make_response("{\"message\":\"%s\"}" % returnString, 200, {"Content-Type": "application/json"}) def attempt_Event_Rerun(eventName, eventTime, eventType, eventSender, eventData): returnString = "" try: - return flask.make_response("{\"message\":\"%s\"}" % returnString, 200, {"Content-Type": "application/json"}) + if "reward" in eventType: + pass + return returnString except: returnString = "Something Went Wrong!" - return flask.make_response("{\"message\":\"%s\"}" % returnString, 200, {"Content-Type": "application/json"}) + return returnString + +def attempt_Event_Rerun_Send(serviceName, servicePort, params): + try: + url = "http://"+ serviceName + ":"+ servicePort + "/api/v1/get_list/all" + resp = requests.get(url) + + if resp.status_code == 200: + print("Got the following message: %s" % resp.text) + data = loads(resp.text) + msg = data['message'] + if msg is not None: + praxis_logger_obj.log(msg) + return msg + # todo send to logger and other relevent services + else: + # todo handle failed requests + return flask.make_response("{\"message\": \"%s\"}" % "Minor Mess up on attempt_Event_Rerun_Send", 200, {"Content-Type": "application/json"}) + except: + return flask.make_response("{\"message\": \"%s\"}" % "Major Mess up on attempt_Event_Rerun_Send", 200, {"Content-Type": "application/json"}) + @api.route('/') def bot_StatusIcon(): diff --git a/user_client/v1/webclient.js b/user_client/v1/webclient.js index 786addd..e9ca2a0 100644 --- a/user_client/v1/webclient.js +++ b/user_client/v1/webclient.js @@ -216,7 +216,7 @@ async function updateEventList() { "

Event:
"+ eventName +"


"+ "

User:
"+ eventSender +"


"+ "

Message:
"+ eventData +"


"+ - ''+ + ''+ "refresh"+ "" $("#EventHistoryWrapper").prepend(template);