From abf71000c2673b530d7f6e93de2b4344e6b73eb3 Mon Sep 17 00:00:00 2001
From: Ching <loooching@gmail.com>
Date: Tue, 28 Nov 2023 16:54:52 +0800
Subject: [PATCH] =?UTF-8?q?feat(discord=5Fbot.py,=20dota.py,=20utils.py):?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=20logger=EF=BC=8C=E5=A2=9E=E5=8A=A0=20log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改 logger，增加 log

Signed-off-by: Ching <loooching@gmail.com>
---
 discord_bot.py | 14 +++++++-------
 dota.py        |  5 ++---
 utils.py       |  6 ++----
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/discord_bot.py b/discord_bot.py
index 355e366..d454d65 100644
--- a/discord_bot.py
+++ b/discord_bot.py
@@ -1,17 +1,17 @@
 import discord
 from discord.ext import tasks
-import logging
+from loguru import logger
 
 import dota
 import utils
 
 
-formatter = logging.Formatter('%(levelname)s %(name)s %(asctime)s %(message)s', '%Y-%m-%d %H:%M:%S')
-log_handler = logging.FileHandler(utils.logger_file)
-log_handler.setFormatter(formatter)
-logger = logging.getLogger(__name__)
-logger.addHandler(log_handler)
-logger.propagate = False
+# formatter = logging.Formatter('%(levelname)s %(name)s %(asctime)s %(message)s', '%Y-%m-%d %H:%M:%S')
+# log_handler = logging.FileHandler(utils.logger_file)
+# log_handler.setFormatter(formatter)
+# logger = logging.getLogger(__name__)
+# logger.addHandler(log_handler)
+# logger.propagate = False
 
 logger.info('start bot')
 
diff --git a/dota.py b/dota.py
index 85a2e9f..42d22b5 100644
--- a/dota.py
+++ b/dota.py
@@ -1,13 +1,11 @@
 import peewee
 import opendota
 import datetime
-import logging
+from loguru import logger
 
 import players
 import utils
 
-logger = logging.getLogger(__name__)
-
 
 db = peewee.SqliteDatabase('dota.db')
 hero_client = opendota.HeroesApi()
@@ -158,6 +156,7 @@ def get_friends_recent_matches():
   for friend in Friend.select():
     for match_ in friend.get_recent_matches():
       if not Match.select().where(Match.match_id == match_.match_id).exists():
+        logger.info('create match, match info: %s' % match_.__dict__)
         match_obj = Match.create(
           match_id=match_.match_id,
           start_time=datetime.datetime.fromtimestamp(match_.start_time),
diff --git a/utils.py b/utils.py
index 0761e1a..1928f5b 100644
--- a/utils.py
+++ b/utils.py
@@ -1,12 +1,10 @@
 import datetime
 import requests
-import logging
+from loguru import logger
 
 # logger_file = '/root/develop/log/dotabot.log'
 logger_file = 'dotabot.log'
-
-logging.basicConfig(filename=logger_file, level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger.add(logger_file)
 
 def convert_seconds_to_hms(total_seconds):
   hours, remainder = divmod(total_seconds, 3600)