diff --git a/src/Droid.py b/src/Droid.py index c31d0b6..d52a513 100644 --- a/src/Droid.py +++ b/src/Droid.py @@ -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"), diff --git a/src/main.py b/src/main.py index 28212d6..d0679c1 100644 --- a/src/main.py +++ b/src/main.py @@ -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?")