diff --git a/Dockerfile_standalone_channelRewards.Dockerfile b/Dockerfile_standalone_channelRewards.Dockerfile index b5d541e..67dac01 100644 --- a/Dockerfile_standalone_channelRewards.Dockerfile +++ b/Dockerfile_standalone_channelRewards.Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10.0a7-alpine3.13 +FROM python:3.7.10-alpine3.12 WORKDIR /Praxis diff --git a/event_logs/event_log_Module.py b/event_logs/event_log_Module.py index adf1f42..e85c03f 100644 --- a/event_logs/event_log_Module.py +++ b/event_logs/event_log_Module.py @@ -111,17 +111,17 @@ class Event_Log_Module(): def get_recent_logs(self, howFarBack): newList = [] try: - for x in range(howFarBack): - recentLog = self.Event_Log_List[-x] + for event in self.Event_Log_List: + #recentLog = self.Event_Log_List[-x] newDic = {} - newDic['eventName'] = recentLog.eventName - newDic['eventTime'] = str(recentLog.eventTime) - newDic['eventType'] = str(recentLog.eventType) - newDic['eventSender'] = str(recentLog.eventSender) - newDic['eventData'] = str(recentLog.eventData) + newDic['eventName'] = event.eventName + newDic['eventTime'] = str(event.eventTime) + newDic['eventType'] = str(event.eventType) + newDic['eventSender'] = str(event.eventSender) + newDic['eventData'] = str(event.eventData) newList.append(newDic) except: - pass + return newList return newList def load_HistoricLogs(self): diff --git a/standalone_channelrewards.py b/standalone_channelrewards.py index 3a554f1..bbe1298 100644 --- a/standalone_channelrewards.py +++ b/standalone_channelrewards.py @@ -64,7 +64,7 @@ def handle_reward(source, username, reward_name, reward_type, rewardPrompt, user reward_response = reward.do_ChannelReward(realSource, username, reward_name, rewardPrompt, userInput, bonusData) return flask.make_response("{\"message\":\"%s\"}" % reward_response, 200, {"Content-Type": "application/json"}) except: - return flask.make_response("This is a magic test", 500) + return flask.make_response("{\"message\":\"%s\"}" % "Something Went horribly wrong", 500) #praxis_logger_obj.log("Doing a reward") def handle_get_list(): diff --git a/standalone_eventLog.py b/standalone_eventLog.py index 97844a1..9c277aa 100644 --- a/standalone_eventLog.py +++ b/standalone_eventLog.py @@ -46,9 +46,28 @@ def add_event(eventName, eventTime, eventType, eventSender, eventData): logging_module.make_event(eventName, eventTime, eventType, eventSender, eventData) return flask.make_response("{\"message\":\"%s\"}" % None, 200, {"Content-Type": "application/json"}) -def get_events(eventCount=100): - returnedData = logging_module.get_recent_logs(eventCount) - payload = json.dumps(returnedData) +def get_events(): + #returnedData = logging_module.get_recent_logs(50) + try: + masterDic = {} + newDic = {} + counter = 0 + for event in logging_module.Event_Log_List: + #recentLog = self.Event_Log_List[-x] + newDic['eventName'] = str(event['eventName']) + newDic['eventTime'] = str(event['eventName']) + newDic['eventType'] = str(event['eventType']) + newDic['eventSender'] = str(event['eventSender']) + newDic['eventData'] = str(event['eventData']) + masterDic[str(counter)] = newDic + counter = counter + 1 + newDic = {} + except: + masterDic = {} + #returnedData = [""] + praxis_logger_obj.log("\nGotten Events" + masterDic) + print("\nGotten Events" + masterDic) + payload = json.dumps(masterDic) payload = base64.b64encode(str.encode(payload)) return flask.make_response("{\"message\":\"%s\"}" % payload.decode(), 200, {"Content-Type": "application/json"}) @@ -106,12 +125,7 @@ def get_event_log(): return flask.make_response('{\"text\":"Argument \'request_type\' not in request"}', 400) if 'request_data' not in request.args: requestData = 50 - else: - try: - requestData = request.args['request_data'] - except: - requestData = 50 - return get_events(requestData) + return get_events() @api.route('/api/v1/event_log/reRunEvent') def reRunEvent(): diff --git a/user_client/v1/webclient.js b/user_client/v1/webclient.js index 7a7ccd2..8889386 100644 --- a/user_client/v1/webclient.js +++ b/user_client/v1/webclient.js @@ -203,32 +203,38 @@ async function GetEventList_OBJ() { async function updateEventList() { $("#EventHistoryWrapper").empty(); let returnedEvents = await GetEventList_OBJ(); + console.log(returnedEvents) - for (var x in returnedEvents){ - console.log(x) - let eventName = returnedEvents[x].eventName - let eventTime = returnedEvents[x].eventTime - let eventType = returnedEvents[x].eventType - let eventSender = returnedEvents[x].eventSender - let eventData = returnedEvents[x].eventData + try { + for (var x in returnedEvents){ + console.log(x) + let eventName = returnedEvents[x].eventName + let eventTime = returnedEvents[x].eventTime + let eventType = returnedEvents[x].eventType + let eventSender = returnedEvents[x].eventSender + let eventData = returnedEvents[x].eventData - console.log(eventName) - console.log(eventTime) - console.log(eventType) - console.log(eventSender) + console.log(eventName) + console.log(eventTime) + console.log(eventType) + console.log(eventSender) - let template = ""+ - "
Event:"+ eventName +"
User:"+ eventSender +"
Message:"+ eventData +"
Event:"+ eventName +"
User:"+ eventSender +"
Message:"+ eventData +"