Skip to content

Commit c5cca62

Browse files
committed
Modified logging outputs
1 parent 473cb9e commit c5cca62

File tree

5 files changed

+28
-23
lines changed

5 files changed

+28
-23
lines changed

bot.py

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646

4747
ch = logging.StreamHandler(stream=sys.stdout)
4848
ch.setLevel(logging.INFO)
49-
formatter = logging.Formatter("%(filename)s[%(lineno)d] - %(levelname)s: %(message)s")
49+
formatter = logging.Formatter("%(asctime)s %(filename)s[%(lineno)d] - %(levelname)s: %(message)s",
50+
datefmt="%b %d %H:%M:%S")
5051
ch.setFormatter(formatter)
5152
logger.addHandler(ch)
5253

@@ -122,16 +123,16 @@ def startup(self):
122123
logger.info("┴ ┴└─┘─┴┘┴ ┴┴ ┴┴┴─┘")
123124
logger.info("v%s", __version__)
124125
logger.info("Authors: kyb3r, fourjr, Taaku18")
125-
logger.line()
126+
logger.line('debug')
126127

127128
for cog in self.loaded_cogs:
128-
logger.info("Loading %s.", cog)
129+
logger.debug("Loading %s.", cog)
129130
try:
130131
self.load_extension(cog)
131-
logger.info("Successfully loaded %s.", cog)
132+
logger.debug("Successfully loaded %s.", cog)
132133
except Exception:
133134
logger.exception("Failed to load %s.", cog)
134-
logger.line()
135+
logger.line('debug')
135136

136137
def _configure_logging(self):
137138
level_text = self.config["log_level"].upper()
@@ -409,14 +410,13 @@ def command_perm(self, command_name: str) -> PermissionLevel:
409410
return level
410411

411412
async def on_connect(self):
412-
logger.line()
413413
try:
414414
await self.validate_database_connection()
415415
except Exception:
416416
logger.debug("Logging out due to failed database connection.")
417417
return await self.logout()
418418

419-
logger.info("Connected to gateway.")
419+
logger.debug("Connected to gateway.")
420420
await self.config.refresh()
421421
await self.setup_indexes()
422422
self._connected.set()
@@ -457,10 +457,11 @@ async def on_ready(self):
457457
return await self.logout()
458458

459459
logger.line()
460-
logger.info("Client ready.")
461-
logger.line()
460+
logger.debug("Client ready.")
462461
logger.info("Logged in as: %s", self.user)
463-
logger.info("User ID: %s", self.user.id)
462+
logger.info("Bot ID: %s", self.user.id)
463+
owners = ", ".join(getattr(self.get_user(owner_id), "name", str(owner_id)) for owner_id in self.owner_ids)
464+
logger.info("Owners: %s", owners)
464465
logger.info("Prefix: %s", self.prefix)
465466
logger.info("Guild Name: %s", self.guild.name)
466467
logger.info("Guild ID: %s", self.guild.id)
@@ -1099,7 +1100,8 @@ async def validate_database_connection(self):
10991100
)
11001101
raise
11011102
else:
1102-
logger.info("Successfully connected to the database.")
1103+
logger.debug("Successfully connected to the database.")
1104+
logger.line('debug')
11031105

11041106
async def post_metadata(self):
11051107
owner = (await self.application_info()).owner
@@ -1125,7 +1127,7 @@ async def post_metadata(self):
11251127
async def before_post_metadata(self):
11261128
await self.wait_for_connected()
11271129
logger.debug("Starting metadata loop.")
1128-
logger.line()
1130+
logger.line('debug')
11291131
if not self.guild:
11301132
self.metadata_loop.cancel()
11311133

cogs/plugins.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ async def initial_load_plugins(self):
147147
logger.error("Error when loading plugin %s.", plugin, exc_info=True)
148148
continue
149149

150-
logger.info("Finished loading all plugins.")
150+
logger.debug("Finished loading all plugins.")
151151
self._ready_event.set()
152152
await self.bot.config.update()
153153

@@ -226,7 +226,7 @@ async def load_plugin(self, plugin):
226226

227227
try:
228228
self.bot.load_extension(plugin.ext_string)
229-
logger.info("Loaded plugin: %s", plugin.ext_string)
229+
logger.info("Loaded plugin: %s", plugin.ext_string.split('.')[-1])
230230
self.loaded_plugins.add(plugin)
231231

232232
except commands.ExtensionError as exc:

cogs/utility.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ async def loop_presence(self):
603603
@loop_presence.before_loop
604604
async def before_loop_presence(self):
605605
await self.bot.wait_for_connected()
606-
logger.line()
606+
logger.line('debug')
607607
activity, status = await self.set_presence()
608608

609609
if activity is not None:

core/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ async def refresh(self) -> dict:
182182
self._cache[k] = v
183183
if not self.ready_event.is_set():
184184
self.ready_event.set()
185-
logger.info("Successfully fetched configurations from database.")
185+
logger.debug("Successfully fetched configurations from database.")
186186
return self._cache
187187

188188
async def wait_until_ready(self) -> None:

core/models.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def _debug_(*msgs):
4444

4545
@staticmethod
4646
def _info_(*msgs):
47-
return f'{Fore.GREEN}{" ".join(msgs)}{Style.RESET_ALL}'
47+
return f'{Fore.LIGHTMAGENTA_EX}{" ".join(msgs)}{Style.RESET_ALL}'
4848

4949
@staticmethod
5050
def _error_(*msgs):
@@ -70,13 +70,16 @@ def critical(self, msg, *args, **kwargs):
7070
if self.isEnabledFor(logging.CRITICAL):
7171
self._log(logging.CRITICAL, self._error_(msg), args, **kwargs)
7272

73-
def exception(self, msg, *args, exc_info=True, **kwargs):
74-
self.error(msg, *args, exc_info=exc_info, **kwargs)
75-
76-
def line(self):
77-
if self.isEnabledFor(logging.INFO):
73+
def line(self, level="info"):
74+
if level == "info":
75+
level = logging.INFO
76+
elif level == "debug":
77+
level = logging.DEBUG
78+
else:
79+
level = logging.INFO
80+
if self.isEnabledFor(level):
7881
self._log(
79-
logging.INFO,
82+
level,
8083
Fore.BLACK
8184
+ Style.BRIGHT
8285
+ "-------------------------"

0 commit comments

Comments
 (0)