From dc828e6bed14b805017eac0c35089454cb92decf Mon Sep 17 00:00:00 2001 From: Jack Sweeney Date: Mon, 14 Nov 2022 13:21:40 -0500 Subject: [PATCH] Cleaner error raise to Discord, remove bad Twitter raises --- __main__.py | 2 +- planeClass.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/__main__.py b/__main__.py index a603c88..9858713 100644 --- a/__main__.py +++ b/__main__.py @@ -221,5 +221,5 @@ except Exception as e: logging.error(e) logging.error(str(traceback.format_exc())) from defDiscord import sendDis - sendDis(str("Error Exiting: " + str(e) + " Failed on " + "https://globe.adsbexchange.com/?icao=" + key), main_config, main_config.get('DISCORD', 'ROLE_ID'), "crash_latest.log") + sendDis(str("Error Exiting: " + str(e) + f"Failed on ({obj.config_path}) https://globe.adsbexchange.com/?icao={key} "), main_config, main_config.get('DISCORD', 'ROLE_ID'), "crash_latest.log") raise e \ No newline at end of file diff --git a/planeClass.py b/planeClass.py index 84614de..187da23 100644 --- a/planeClass.py +++ b/planeClass.py @@ -8,6 +8,7 @@ class Plane: self.icao = icao.upper() self.callsign = None self.config = config + self.config_path = config_path self.overrides = {} if self.config.has_option('DATA', 'OVERRIDE_REG'): self.reg = self.config.get('DATA', 'OVERRIDE_REG') @@ -478,8 +479,7 @@ class Plane: self.tweet_api.create_media_metadata(media_id= twitter_media_map_obj.media_id, alt_text= alt_text) self.latest_tweet_id = self.tweet_api.update_status(status = ((self.twitter_title + " " + message).strip()), media_ids=[twitter_media_map_obj.media_id]).id except tweepy.errors.TweepyException as e: - print(e) - raise Exception(self.icao) from e + raise #Meta if self.config.has_option('META', 'ENABLE') and self.config.getboolean('META', 'ENABLE'): from meta_toolkit import post_to_meta_both @@ -513,8 +513,7 @@ class Plane: try: self.latest_tweet_id = self.tweet_api.update_status(status = ((self.twitter_title + " " + distance_message + " " + fuel_message).strip()), in_reply_to_status_id = self.latest_tweet_id).id except tweepy.errors.TweepyException as e: - print(e) - raise Exception(self.icao) from e + raise self.latest_tweet_id = None self.recheck_route_time = None self.known_to_airport = None