ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2025-01-19 09:38:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #334 from nonebot/yanyongyu/issue332

Browse Source 
Fix: log module name error
This commit is contained in:
Ju4tCode 2021-04-19 21:50:11 +08:00 committed by GitHub
commit 4ba6ff106c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nonebot/log.py
View File

@ -48,6 +48,10 @@ class Filter:
self.level: Union[int, str] = "DEBUG" self.level: Union[int, str] = "DEBUG"
def __call__(self, record): def __call__(self, record):
module = sys.modules.get(record["name"])
if module:
plugin_name = getattr(module, "__plugin_name__", record["name"])
record["name"] = plugin_name
record["name"] = record["name"].split(".")[0] record["name"] = record["name"].split(".")[0]
levelno = logger.level(self.level).no if isinstance(self.level, levelno = logger.level(self.level).no if isinstance(self.level,
str) else self.level str) else self.level

3
nonebot/plugin/manager.py
View File

@ -215,6 +215,9 @@ class PluginLoader(SourceFileLoader):
return return
# really need? # really need?
# setattr(module, "__manager__", self.manager) # setattr(module, "__manager__", self.manager)
if self._plugin_token:
setattr(module, "__plugin_name__",
_current_plugin.get(self._plugin_token))
if self._export_token: if self._export_token:
setattr(module, "__export__", _export.get()) setattr(module, "__export__", _export.get())