diff --git a/config_example/config.j2 b/config_example/config.j2 index 40197e5..6fed85d 100644 --- a/config_example/config.j2 +++ b/config_example/config.j2 @@ -1,12 +1,19 @@ #!/usr/bin/env python # -*- coding: UTF-8 -*- import os -import report +import logging from remotes import yamaha_ras5 as amplifier from remotes import technics_eur642100 as cd_player -__BASEPATH__ = os.path.abspath(os.path.dirname(__file__)) + +DEBUG = False +# +# Logging +# +APP_NAME = "remote_control" +LOG_HOSTNAME = "loggy" # When DEBUG is True +LOG_LEVEL = logging.INFO # STDOUT logging MQTT_SERVER = "{{ smart_sat_remotectrl_hostname }}" MQTT_USER = "{{ smart_sat_remotectrl_username }}" @@ -17,15 +24,3 @@ SUPPORTED_REMOTES = { amplifier.NAME: amplifier.ALL, cd_player.NAME: cd_player.ALL } - -# -# Logging -# -APP_NAME = "remote_control" -LOGTARGET = 'stdout' # possible choices are: 'logfile' or 'stdout' -LOGLVL = 'INFO' - -LOGHOST = 'cutelog' -LOGPORT = 19996 - -formatter = report.SHORT_FMT diff --git a/remote_control.py b/remote_control.py index cc8d852..8d1e6c8 100644 --- a/remote_control.py +++ b/remote_control.py @@ -1,18 +1,12 @@ import config import json import lirc -import logging import mqtt import report import socket import time -try: - from config import APP_NAME as ROOT_LOGGER_NAME -except ImportError: - ROOT_LOGGER_NAME = 'root' -logger = logging.getLogger(ROOT_LOGGER_NAME).getChild('main') - +logger = report.default_logging_config() class remote_control(mqtt.mqtt_client): def __init__(self): @@ -92,8 +86,6 @@ class remote_control(mqtt.mqtt_client): if __name__ == '__main__': - report.appLoggingConfigure(config.__BASEPATH__, config.LOGTARGET, ((config.APP_NAME, config.LOGLVL), ), fmt=config.formatter, host=config.LOGHOST, port=config.LOGPORT) - # rc = remote_control() # while (True): diff --git a/report b/report index 21bac82..60be783 160000 --- a/report +++ b/report @@ -1 +1 @@ -Subproject commit 21bac82e0c459ebf6d34783c9249526a657a6bbd +Subproject commit 60be78310ee6b6a5a091f27f9e5e514927d7520f