Compare commits
1 Commits
master
...
user-clien
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f872f1fe07 |
@ -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():
|
||||
|
||||
@ -216,7 +216,7 @@ async function updateEventList() {
|
||||
"<div class=\"col s12 m3\"><p>Event: <br>"+ eventName +"</p><br></div>"+
|
||||
"<div class=\"col s12 m3\"><p>User: <br>"+ eventSender +"</p><br></div>"+
|
||||
"<div class=\"col s12 m3\"><p>Message: <br>"+ eventData +"</p><br></div>"+
|
||||
'<a onclick="'+ reRunEvent_Params +'" class="hide btn waves-effect waves-light green right col s1" style="position: absolute; right: 0; top: 0; width: 3em;">'+
|
||||
'<a onclick="'+ reRunEvent_Params +'" class="btn waves-effect waves-light green right col s1" style="position: absolute; right: 0; top: 0; width: 3em;">'+
|
||||
"<i class=\"material-icons\">refresh</i>"+
|
||||
"</a></div>"
|
||||
$("#EventHistoryWrapper").prepend(template);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user