Browse Source

Fix logging and deps

Kirk Trombley 4 years ago
parent
commit
b2b3348de5
4 changed files with 32 additions and 3 deletions
  1. 1 3
      lib/rollbot/bot.py
  2. 21 0
      logging.conf
  3. 3 0
      repl_driver.py
  4. 7 0
      requirements.txt

+ 1 - 3
lib/rollbot/bot.py

@@ -8,8 +8,6 @@ import aiohttp
 
 from .types import CommandConfiguration, Message, Response, Context, Command
 
-# TODO logging config
-
 
 RawMsg = TypeVar("RawMsg")
 
@@ -25,7 +23,7 @@ class Rollbot(Generic[RawMsg]):
             respond=self.respond,
             request=aiohttp.ClientSession(),
             database=lambda: aiosqlite.connect(self.database_file),
-            logger=logging.getLogger(__name__),
+            logger=logging.getLogger(),
         )
 
     def read_config(self, key: str) -> Any:

+ 21 - 0
logging.conf

@@ -0,0 +1,21 @@
+[loggers]
+keys=root
+
+[handlers]
+keys=console
+
+[formatters]
+keys=normal
+
+[logger_root]
+level=INFO
+handlers=console
+
+[handler_console]
+class=StreamHandler
+level=DEBUG
+formatter=normal
+args=(sys.stdout,)
+
+[formatter_normal]
+format=%(asctime)s loglevel=%(levelname)-6s logger=%(name)s %(funcName)s() L%(lineno)-4d %(message)s

+ 3 - 0
repl_driver.py

@@ -1,10 +1,13 @@
 from datetime import datetime
 from logging import Logger
+import logging.config
 import asyncio
 
 import rollbot
 from rollbot.injection import ArgList, Lazy, Database, Data, Args, Arg, Subcommand
 
+logging.config.fileConfig('logging.conf', disable_existing_loggers=False)
+
 
 @rollbot.initialize_data
 class MyCounter:

+ 7 - 0
requirements.txt

@@ -1,11 +1,17 @@
+aiohttp==3.7.4.post0
 aiosqlite==0.17.0
 appdirs==1.4.4
 astroid==2.5.6
+async-timeout==3.0.1
+attrs==21.2.0
 black==21.5b0
+chardet==4.0.0
 click==7.1.2
+idna==3.1
 isort==5.8.0
 lazy-object-proxy==1.6.0
 mccabe==0.6.1
+multidict==5.1.0
 mypy-extensions==0.4.3
 pathspec==0.8.1
 pylint==2.8.2
@@ -13,3 +19,4 @@ regex==2021.4.4
 toml==0.10.2
 typing-extensions==3.10.0.0
 wrapt==1.12.1
+yarl==1.6.3