diff --git a/kontor-scripts/log.py b/kontor-scripts/log.py new file mode 100644 index 0000000..d634937 --- /dev/null +++ b/kontor-scripts/log.py @@ -0,0 +1,43 @@ +import logging.config + +def get_logger(level: int, name: str) -> logging.Logger: + logging.config.dictConfig({ + 'version': 1, + 'disable_existing_loggers': False, + 'formatters': { + 'simple': { + 'format': '[%(asctime)s] {%(filename)s:%(lineno)d} %(levelname)s - %(message)s', + 'datefmt': '%Y-%m-%d %H:%M:%S', + }, + }, + 'handlers': { + 'console': { + 'class': logging.StreamHandler, + 'level': logging.DEBUG, + 'formatter': 'simple', + 'stream': 'ext://sys.stdout' + }, + }, + 'loggers': { + 'urllib3.connectionpool': { + 'level': 'WARNING', + 'propagate': False, + }, + 'root': { + 'level': 'DEBUG', + 'handlers': ['console'], + }, + }, + }) + logger = logging.getLogger(name) + if level is not None: + match level: + case 0: + logger.setLevel(logging.WARNING) + case 1: + logger.setLevel(logging.INFO) + case 2: + logger.setLevel(logging.DEBUG) + case _: + logger.setLevel(logging.CRITICAL) + return logger diff --git a/kontor-scripts/read_queue.py b/kontor-scripts/read_queue.py index 7156318..2e57bd9 100644 --- a/kontor-scripts/read_queue.py +++ b/kontor-scripts/read_queue.py @@ -8,42 +8,23 @@ import msgspec from pathlib import Path from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter from platformdirs import PlatformDirs +from log import get_logger parser = ArgumentParser(formatter_class=ArgumentDefaultsHelpFormatter) -parser.add_argument("--config", "-c", default="kontor-docker") parser.add_argument('--verbose', '-v', action='count', default=0) parser.add_argument("--server", "-s", default="127.0.0.1") +parser.add_argument("--port", "-p", default="61616") args = parser.parse_args() -logger = logging.getLogger(__name__) - -def get_logger(level: int, config: str): - """ - create Logger with configuration from config file - """ - dirs = PlatformDirs(config) - logging_config = Path(dirs.user_config_dir, "logging-config.yaml") - with open(logging_config, "rt", encoding="UTF-8") as f: - config_dict = yaml.safe_load(f.read()) - logging.config.dictConfig(config_dict) - log = logging.getLogger("development") - if level is not None: - match level: - case 0: - log.setLevel(logging.INFO) - case 1: - log.setLevel(logging.DEBUG) - case _: - log.setLevel(logging.CRITICAL) - return log class Link(msgspec.Struct): url: str class MyListener(stomp.ConnectionListener): - def __init__(self, log): + def __init__(self, log, conn): self.log = log + self.conn = conn pass def on_error(self, frame): @@ -53,14 +34,17 @@ class MyListener(stomp.ConnectionListener): self.log.info("received a message %s", frame.body) link = msgspec.json.decode(frame.body, type=Link) self.log.info("found link: %s", link.url) + json_bytes = msgspec.json.encode(link) + self.conn.send(body=json_bytes, destination="add_link_accepted") + self.conn.send(body=json_bytes, destination="update_title") if __name__ == '__main__': - logger = get_logger(args.verbose, args.config) + logger = get_logger(args.verbose, __file__) logger.info("kontor.read_queue started") - host = [(args.server, 61616)] + host = [(args.server, args.port)] conn = stomp.Connection(host_and_ports=host) - conn.set_listener('', MyListener(logger)) + conn.set_listener('', MyListener(logger, conn)) conn.connect(username='artemis', passcode='artemis', wait=True) conn.subscribe(destination='add_link', id=1, ack='auto', headers={}) time.sleep(5)