From 1317783063b8040b0f24b07cf9151d94cd4473c5 Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Tue, 21 Feb 2023 11:35:34 -0600 Subject: [PATCH] Resolved database timeout errors --- cogs/players.py | 17 ++++++++++++++--- cogs/transactions.py | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/cogs/players.py b/cogs/players.py index d23df3a..640a52a 100644 --- a/cogs/players.py +++ b/cogs/players.py @@ -94,11 +94,22 @@ class Players(commands.Cog): @tasks.loop(count=1) async def build_master_player_list(self): + guild = self.bot.get_guild(int(os.environ.get('GUILD_ID'))) + if not guild: + logging.error(f'build_master_player_list - could not pull guild / retrying in 15 seconds') + await asyncio.sleep(15) + guild = self.bot.get_guild(int(os.environ.get('GUILD_ID'))) + logging.info(f'build_master_player_list - guild: {guild}') + + logging.info(f'build_master_player_list - getting current') current = await get_current() - all_players = await get_players(current['season']) + logging.info(f'build_master_player_list - getting all_players') + # all_players = await get_players(current['season']) + all_players = db_get('players', api_ver=2, timeout=8, params=[('season', current['season'])]) + logging.info(f'build_master_player_list - building player_list') self.player_list = {all_players[player]['name'].lower(): all_players[player]['id'] for player in all_players} + logging.info(f'player list count: {len(self.player_list)}') logging.debug(f'player list: {self.player_list}') - logging.warning(f'player list count: {len(self.player_list)}') @staticmethod async def update_injuries(ctx): @@ -2897,7 +2908,7 @@ class Players(commands.Cog): keeper_swar += this_p['wara'] await interaction.response.send_message(content=f'{team["sname"]} Keepers:\n{keeper_string}') - all_players = db_get('players', api_ver=3, params=[('team_abbrev', team['abbrev'])]) + all_players = db_get('players', api_ver=2, params=[('team_abbrev', team['abbrev'])]) logging.info(f'all_players: {all_players}') fa = await get_one_team('FA') diff --git a/cogs/transactions.py b/cogs/transactions.py index 37a4898..e8759ad 100644 --- a/cogs/transactions.py +++ b/cogs/transactions.py @@ -579,7 +579,7 @@ class Transactions(commands.Cog): # csv = DataFrame(csv_data).to_csv(header=False, index=False) # csv = pandas.read_csv(csv_data) - ap = await get_players(season) + ap = db_get('players', api_ver=2, timeout=8, params=[('season', season)]) player_data = [ ['name', 'sWAR', 'image', 'vanity_card', 'team_abbrev', 'inj_rat', 'pos_1', 'pos_2', 'pos_3', 'pos_4', 'pos_5', 'pos_6', 'pos_7', 'pos_8', 'last_game', 'last_game2', 'il_return', 'dem_week', 'strat_code',