This commit is contained in:
0xDEAD10CC 2017-07-27 03:35:34 -07:00 committed by Steve Bouché
parent 220f852880
commit 952f70d859
2 changed files with 15 additions and 5 deletions

View file

@ -26,6 +26,13 @@ class DroidControllerTask(CoindroidAPITask):
self.twilioClient = TwilioClient(twilioAccount, twilioToken)
def getDroidStats(self, event):
targetID = None
targetName = None
try:
targetID = event.get("target").get("id")
targetName = event.get("target").get("name")
except AttributeError:
self.logger.exception("Unknown target!")
return {
"block_height": event.get("block_height"),
"action_id": event.get("action_id"),
@ -34,8 +41,8 @@ class DroidControllerTask(CoindroidAPITask):
"player_username": event.get("player_username"),
"droid_id": event.get("droid_id"),
"droid_name": event.get("droid_name"),
"targetID": event.get("target").get("id"),
"targetName": event.get("target").get("name"),
"targetID": targetID,
"targetName": targetName,
"healthChangedFrom": next(
(x.get("value_from") for x in event.get("outcomes") if
x.get("outcome_type") == "Health changed"),

View file

@ -9,7 +9,8 @@ from Currency import CurrencyTask
from Event import EventTask
from Droid import DroidControllerTask
formatter = logging.Formatter('%(asctime)s - %(name)s %(funcName)s():%(lineno)d - %(levelname)s - %(message)s')
formatter = logging.Formatter(
'%(asctime)s - %(name)s %(funcName)s():%(lineno)d - %(levelname)s - %(message)s')
logger = logging.getLogger()
logger.setLevel(logging.DEBUG)
ch = logging.StreamHandler()
@ -25,8 +26,10 @@ def main():
eventTaskEvent = Event()
droidControllerQueue = Queue()
currencyTask = CurrencyTask.spawn(eventTaskEvent=eventTaskEvent)
eventTask = EventTask.spawn(eventTaskEvent=eventTaskEvent, droidControllerQueue=droidControllerQueue)
droidController = DroidControllerTask.spawn(droidControllerQueue=droidControllerQueue)
eventTask = EventTask.spawn(eventTaskEvent=eventTaskEvent,
droidControllerQueue=droidControllerQueue)
droidController = DroidControllerTask.spawn(
droidControllerQueue=droidControllerQueue)
gevent.joinall([currencyTask, eventTask, droidController])
logger.error("Main loop ended... This shouldn't happen?")