From c89f7a1d6cfd1fa9264483321f55bdedc905e28c Mon Sep 17 00:00:00 2001 From: ConnorSkees <39542938+ConnorSkees@users.noreply.github.com> Date: Sat, 1 Jun 2019 10:05:39 -0400 Subject: [PATCH] Add basic logging --- deletefb/deletefb.log | 0 deletefb/deletefb.py | 14 ++++++--- deletefb/logging_conf.json | 62 ++++++++++++++++++++++++++++++++++++++ deletefb/tools/common.py | 13 +++++++- 4 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 deletefb/deletefb.log create mode 100644 deletefb/logging_conf.json diff --git a/deletefb/deletefb.log b/deletefb/deletefb.log new file mode 100644 index 0000000..e69de29 diff --git a/deletefb/deletefb.py b/deletefb/deletefb.py index b6cc483..832280a 100755 --- a/deletefb/deletefb.py +++ b/deletefb/deletefb.py @@ -2,12 +2,18 @@ import argparse import getpass -import sys +import json import os +import sys + +from tools.common import logger +from tools.login import login +from tools.wall import delete_posts +from tools.likes import unlike_pages + + +LOG = logger(__name__) -from .tools.login import login -from .tools.wall import delete_posts -from .tools.likes import unlike_pages def run_delete(): parser = argparse.ArgumentParser() diff --git a/deletefb/logging_conf.json b/deletefb/logging_conf.json new file mode 100644 index 0000000..2078e80 --- /dev/null +++ b/deletefb/logging_conf.json @@ -0,0 +1,62 @@ +{ + "logging": { + "version": 1, + "disable_existing_loggers": true, + "formatters": { + "brief": { + "class": "logging.Formatter", + "style": "{", + "datefmt": "%H:%M:%S", + "format": "{name:s}-{levelname:s}-{asctime:s}-{message:s}" + }, + "verbose": { + "class": "logging.Formatter", + "style": "{", + "datefmt": "%Y-%m-%dT%H:%M:%S", + "format": "{name:s}:{levelname:s}:L{lineno:d} {asctime:s} {message:s}" + } + }, + "handlers": { + "console": { + "level": "DEBUG", + "class": "logging.StreamHandler", + "formatter": "brief", + "stream": "ext://sys.stdout" + }, + "file_handler": { + "level": "INFO", + "class": "logging.handlers.WatchedFileHandler", + "formatter": "verbose", + "filename": "deletefb/deletefb.log", + "mode": "a", + "encoding": "utf-8" + } + }, + "loggers": { + "root": { + "level": "DEBUG", + "handlers": ["console", "file_handler"] + }, + "deletefb": { + "level": "DEBUG", + "handlers": ["console"], + "propagate": false + }, + "login": { + "level": "DEBUG", + "handlers": ["file_handler"], + "propagate": false + }, + "likes": { + "level": "DEBUG", + "handlers": ["file_handler"], + "propagate": false + }, + "wall": { + "level": "DEBUG", + "handlers": ["file_handler"], + "propagate": false + } + } + } +} diff --git a/deletefb/tools/common.py b/deletefb/tools/common.py index e086df6..b50dc90 100644 --- a/deletefb/tools/common.py +++ b/deletefb/tools/common.py @@ -1,6 +1,8 @@ import json +import logging +import logging.config import os -from os.path import abspath, relpath, split +from os.path import abspath, relpath, split, isfile import time from selenium.common.exceptions import ( @@ -24,6 +26,15 @@ def try_move(actions, el): time.sleep(5) continue +def logger(name: str): + # called from directory (__main__.py) + config_path = "deletefb/logging_conf.json" + if not isfile(config_path): # called from file (deletefb.py) + os.chdir("..") + with open(config_path, "r", encoding="utf-8") as config_file: + config = json.load(config_file) + logging.config.dictConfig(config["logging"]) + return logging.getLogger("deletefb") def archiver(category): """