diff --git a/config_example/config.j2 b/config_example/config.j2 index 8915995..fbd7dd5 100644 --- a/config_example/config.j2 +++ b/config_example/config.j2 @@ -1,22 +1,22 @@ #!/usr/bin/env python # -*- coding: UTF-8 -*- import os -import report +import logging + +DEBUG = False +# +# Logging +# +APP_NAME = "mpd" +LOG_HOSTNAME = "loggy" # When DEBUG is True +LOG_LEVEL = logging.INFO # STDOUT logging + + +# +# Application +# MQTT_SERVER = "{{ audio_mpd_hostname }}" MQTT_USER = "{{ audio_mpd_username }}" MQTT_PASS = "{{ audio_mpd_password }}" MQTT_TOPIC = "{{ audio_mpd_topic }}" - -# -# Logging -# -__BASEPATH__ = os.path.abspath(os.path.dirname(__file__)) -APP_NAME = "mpd" -LOGTARGET = 'stdout' # possible choices are: 'logfile' or 'stdout' -LOGLVL = 'INFO' - -LOGHOST = 'cutelog' -LOGPORT = 19996 - -formatter = report.SHORT_FMT diff --git a/report b/report index 21bac82..60be783 160000 --- a/report +++ b/report @@ -1 +1 @@ -Subproject commit 21bac82e0c459ebf6d34783c9249526a657a6bbd +Subproject commit 60be78310ee6b6a5a091f27f9e5e514927d7520f diff --git a/smart_mpd.py b/smart_mpd.py index 10fce62..6615330 100644 --- a/smart_mpd.py +++ b/smart_mpd.py @@ -1,18 +1,11 @@ import config -import logging import mqtt import report -import socket import subprocess 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('librespot') - +logger = report.default_logging_config() mc = mqtt.mqtt_client(config.APP_NAME, config.MQTT_SERVER, 1883, config.MQTT_USER, config.MQTT_PASS) @@ -65,7 +58,5 @@ def send_title_msg_mqtt(title): if __name__ == '__main__': - report.appLoggingConfigure(config.__BASEPATH__, config.LOGTARGET, ((config.APP_NAME, config.LOGLVL), ), fmt=config.formatter, host=config.LOGHOST, port=config.LOGPORT) - mpd = mpc(send_state_msg_mqtt, send_title_msg_mqtt) mpd.run()