Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/common/database.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ def __init__(self, db_name: str, db_dir: Union[str, Path] = data_dir, use_git: b
try:
self.repo.git.push('--set-upstream', 'origin', self.repo_branch)
logger.info(f"Created and pushed new empty branch '{self.repo_branch}'")
except git.exc.GitCommandError as e:
logger.error(f"Failed to push new branch: {str(e)}")
except git.exc.GitCommandError:
logger.exception("Failed to push new branch")
# Continue anyway - we might not have push permissions
else:
# Re-raise if it's a different error
Expand Down Expand Up @@ -184,8 +184,8 @@ def _configure_repo(self):
try:
origin = self.repo.remote('origin')
origin.set_url(new_url)
except git.exc.GitCommandError as e:
logger.error(f"Failed to update remote URL: {str(e)}")
except git.exc.GitCommandError:
logger.exception("Failed to update remote URL")
# Continue anyway, might work with stored credentials

def _check_for_migration(self):
Expand Down Expand Up @@ -270,8 +270,8 @@ def _migrate_from_shelve(self):
migration_db.close()

logger.info(f"Migration completed successfully: {self.json_path}")
except Exception as e:
logger.error(f"Migration failed: {str(e)}")
except Exception:
logger.exception("Migration failed")

def __enter__(self):
self.lock.acquire()
Expand Down Expand Up @@ -327,11 +327,11 @@ def sync(self):
push_url = f"{protocol}://{self.git_user_name}:{self.git_token}@{repo_path}"
self.repo.git.push(push_url, self.repo_branch)
logger.info("Pushed changes to remote git data repository")
except git.exc.GitCommandError as e:
logger.error(f"Failed to push changes: {str(e)}")
except git.exc.GitCommandError:
logger.exception("Failed to push changes")

except Exception as e:
logger.error(f"Git operation failed: {str(e)}")
except Exception:
logger.exception("Git operation failed")
finally:
# Ensure database is ready for next use
if self.tinydb is None:
Expand Down
23 changes: 12 additions & 11 deletions src/common/rank.py
Original file line number Diff line number Diff line change
Expand Up @@ -628,10 +628,10 @@ def _do_reddit_migration(
total_submissions += 1
elif skipped:
skipped_submissions += 1
except Exception as e:
except Exception:
author_name = submission.get('author', 'unknown')
logger.error(
f"Unexpected error processing submission by '{author_name}': {type(e).__name__}: {e}")
logger.exception(
f"Unexpected error processing submission by '{author_name}'")
skipped_submissions += 1

# Process comments
Expand All @@ -647,16 +647,17 @@ def _do_reddit_migration(
total_comments += 1
elif skipped:
skipped_comments += 1
except Exception as e:
except Exception:
author_name = comment.get('author', 'unknown')
logger.error(f"Unexpected error processing comment by '{author_name}': {type(e).__name__}: {e}")
logger.exception(
f"Unexpected error processing comment by '{author_name}'")
skipped_comments += 1

# Update the rank database
new_users, updated_users = self._update_reddit_rank_database(community_id, user_xp_map)

except Exception as e:
logger.error(f"Error during Reddit migration: {type(e).__name__}: {e}", exc_info=True)
except Exception:
logger.exception("Error during Reddit migration")
database.GIT_ENABLED = original_git_enabled
raise

Expand Down Expand Up @@ -749,11 +750,11 @@ async def _fetch_mee6_page(
logger.info(f"Processing {player_count} players from page {page}")
return data['players']

except aiohttp.ClientError as e:
logger.error(f"HTTP error during migration: {e}", exc_info=True)
except aiohttp.ClientError:
logger.exception("HTTP error during migration")
return None
except Exception as e:
logger.error(f"Unexpected error during migration: {e}", exc_info=True)
except Exception:
logger.exception("Unexpected error during migration")
import traceback
traceback.print_exc()
return None
Expand Down
4 changes: 2 additions & 2 deletions src/discord_bot/bot.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ async def async_send_message(

try:
return await channel.send(content=message, embed=embed)
except Exception as e:
logger.error(f"Error sending message: {e}", exc_info=True)
except Exception:
logger.exception("Error sending message")
self.DEGRADED = True

def send_message(
Expand Down
8 changes: 3 additions & 5 deletions src/discord_bot/cogs/autoban.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,11 @@ async def on_message(self, message: discord.Message):
guild.name,
guild.id,
)
except discord.HTTPException as e:
logger.error(
"HTTP error while banning user %s (%s): %s",
except discord.HTTPException:
logger.exception(
"HTTP error while banning user %s (%s)",
message.author,
message.author.id,
e,
exc_info=True,
)


Expand Down
8 changes: 4 additions & 4 deletions src/discord_bot/cogs/rank.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ async def xp_award_task(self):
)
embed.set_thumbnail(url=user.display_avatar.url)
await channel.send(embed=embed)
except Exception as e:
logger.error(f"Error handling level up notification: {e}", exc_info=True)
except Exception:
logger.exception("Error handling level up notification")

# Clear the set for the next minute
self.active_users.clear()
Expand Down Expand Up @@ -551,8 +551,8 @@ async def auto_migrate_mee6(self):
except discord.HTTPException:
pass # Silently fail if can't send

except Exception as e:
logger.error(f"Error during automatic Mee6 migration for guild {guild.id}: {e}", exc_info=True)
except Exception:
logger.exception(f"Error during automatic Mee6 migration for guild {guild.id}")


def setup(bot):
Expand Down
20 changes: 10 additions & 10 deletions src/reddit_bot/bot.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ def process_comment(self, comment: models.Comment):
xp_result = self.award_reddit_xp(comment.author)
if xp_result and xp_result.get('level_up'):
logger.info(f"User {comment.author.name} leveled up to {xp_result.get('level')}!")
except Exception as e:
logger.error(f"Error awarding XP: {e}", exc_info=True)
except Exception:
logger.exception("Error awarding XP")

comment_data = self.slash_commands(comment=comment, comment_data=comment_data)
comment_data['processed'] = True
Expand Down Expand Up @@ -217,8 +217,8 @@ def process_submission(self, submission: models.Submission):
xp_result = self.award_reddit_xp(submission.author)
if xp_result and xp_result.get('level_up'):
logger.info(f"User {submission.author.name} leveled up to {xp_result.get('level')}!")
except Exception as e:
logger.error(f"Error awarding XP: {e}", exc_info=True)
except Exception:
logger.exception("Error awarding XP")

if os.getenv('DISCORD_REDDIT_CHANNEL_ID'):
submission_data = self.discord(submission=submission, submission_data=submission_data)
Expand Down Expand Up @@ -288,8 +288,8 @@ def migrate_reddit_ranks(self):

logger.info(f"Reddit ranks migration completed: {stats}")

except Exception as e:
logger.error(f"Error during Reddit ranks migration: {e}", exc_info=True)
except Exception:
logger.exception("Error during Reddit ranks migration")
self.DEGRADED = True
reason = inspector.current_name()
self.DEGRADED_REASONS.append(reason) if reason not in self.DEGRADED_REASONS else None
Expand Down Expand Up @@ -407,8 +407,8 @@ def _comment_loop(self, test: bool = False):
break
if test:
return comment
except prawcore.exceptions.ServerError as e:
logger.error(f"Server Error: {e}", exc_info=True)
except prawcore.exceptions.ServerError:
logger.exception("Server Error")
self.DEGRADED = True
self.DEGRADED_REASONS.append(reason) if reason not in self.DEGRADED_REASONS else None
time.sleep(60)
Expand All @@ -430,8 +430,8 @@ def _submission_loop(self, test: bool = False):
break
if test:
return submission
except prawcore.exceptions.ServerError as e:
logger.error(f"Server Error: {e}", exc_info=True)
except prawcore.exceptions.ServerError:
logger.exception("Server Error")
self.DEGRADED = True
self.DEGRADED_REASONS.append(reason) if reason not in self.DEGRADED_REASONS else None
time.sleep(60)
Expand Down
16 changes: 8 additions & 8 deletions src/reddit_bot/cogs/rank.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ def __init__(self, name, subreddit_id):
'progress': progress,
'xp_for_next_level': next_level_xp - user_data['xp']
}
except Exception as e:
logger.error(f"Error getting rank for Reddit user {username}: {e}", exc_info=True)
except Exception:
logger.exception(f"Error getting rank for Reddit user {username}")
return None

def get_leaderboard(self, limit: int = 10, offset: int = 0):
Expand Down Expand Up @@ -112,8 +112,8 @@ def get_leaderboard(self, limit: int = 10, offset: int = 0):
entry['level'] = self.rank_system.calculate_level(entry['xp'])

return leaderboard
except Exception as e:
logger.error(f"Error getting Reddit leaderboard: {e}", exc_info=True)
except Exception:
logger.exception("Error getting Reddit leaderboard")
return []

def respond_to_rank_command(self, comment: models.Comment):
Expand Down Expand Up @@ -174,8 +174,8 @@ def respond_to_rank_command(self, comment: models.Comment):
comment.reply(response)
return True

except Exception as e:
logger.error(f"Error responding to rank command: {e}", exc_info=True)
except Exception:
logger.exception("Error responding to rank command")
return False

def respond_to_leaderboard_command(self, comment: models.Comment):
Expand Down Expand Up @@ -236,6 +236,6 @@ def respond_to_leaderboard_command(self, comment: models.Comment):
comment.reply(response)
return True

except Exception as e:
logger.error(f"Error responding to leaderboard command: {e}", exc_info=True)
except Exception:
logger.exception("Error responding to leaderboard command")
return False