From 3bbd2ed88f5ff684f13a3a4a25b19e467b995759 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Tue, 18 Dec 2018 19:34:34 +0100 Subject: [PATCH] weeeeeee --- bots.py | 9 ++++++--- statsupdate.py | 11 +++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/bots.py b/bots.py index 53d739fb..d15f660e 100644 --- a/bots.py +++ b/bots.py @@ -26,8 +26,11 @@ if __name__ == "__main__": telegram.start() logger.info("Starting Reddit Bot process...") reddit.start() - logger.info("Starting StatsUpdate process...") - stats.start() + if not __debug__: + logger.info("Starting StatsUpdate process...") + stats.start() + else: + logger.warning("StatsUpdate process disabled in debug mode.") try: while True: if discord.exitcode is not None: @@ -48,7 +51,7 @@ if __name__ == "__main__": reddit = multiprocessing.Process(target=redditbot.process) logger.info("Restarting Reddit Bot process...") reddit.start() - if stats.exitcode is not None: + if not __debug__ and stats.exitcode is not None: logger.warning(f"StatsUpdater exited with {stats.exitcode}") del stats stats = multiprocessing.Process(target=statsupdate.process) diff --git a/statsupdate.py b/statsupdate.py index bc24deb7..5a3c956c 100644 --- a/statsupdate.py +++ b/statsupdate.py @@ -62,17 +62,17 @@ def new_lol_rank(item, change: typing.Tuple[Dirty]): try: if solo: telegram_bot.send_message(config["Telegram"]["main_group"], - f"✳️ {item.royal.username} ha cambiato rank su League of Legends!\n" + f"✳️ {item.royal.username} ha un nuovo rank in **SOLO/DUO** su League of Legends!\n" f"{solo.initial_value[0]} {solo.initial_value[1]} -> **{solo.value[0]} {solo.value[1]}**", parse_mode="Markdown") if flex: telegram_bot.send_message(config["Telegram"]["main_group"], - f"✳️ {item.royal.username} ha cambiato rank su League of Legends!\n" + f"✳️ {item.royal.username} ha un nuovo rank in **FLEX** su League of Legends!\n" f"{flex.initial_value[0]} {flex.initial_value[1]} -> **{flex.value[0]} {flex.value[1]}**", parse_mode="Markdown") if twtr: telegram_bot.send_message(config["Telegram"]["main_group"], - f"✳️ {item.royal.username} ha cambiato rank su League of Legends!\n" + f"✳️ {item.royal.username} ha un nuovo rank in **3V3** su League of Legends!\n" f"{twtr.initial_value[0]} {twtr.initial_value[1]} -> **{twtr.value[0]} {twtr.value[1]}**", parse_mode="Markdown") except Exception: @@ -81,9 +81,6 @@ def new_lol_rank(item, change: typing.Tuple[Dirty]): def process(): while True: - if not __debug__: - logger.info("Pausing for 30 minutes.") - time.sleep(1800) session = db.Session() logger.info("Now updating Steam data.") update_block(session, session.query(db.Steam).all()) @@ -100,6 +97,8 @@ def process(): logger.info("Now updating Overwatch data.") update_block(session, session.query(db.Overwatch).all(), delay=5) session.commit() + logger.info("Pausing for 30 minutes.") + time.sleep(1800) if __name__ == "__main__":