mirror of
https://github.com/PiBrewing/craftbeerpi4.git
synced 2024-11-21 22:48:16 +01:00
add debug-log-level to config.yaml to enable different logging level also in cbpi service
This commit is contained in:
parent
65a1e54632
commit
beb350978e
3 changed files with 18 additions and 7 deletions
|
@ -1,3 +1,3 @@
|
||||||
__version__ = "4.2.0.a8"
|
__version__ = "4.2.0.a9"
|
||||||
__codename__ = "Indian Summer"
|
__codename__ = "Indian Summer"
|
||||||
|
|
||||||
|
|
21
cbpi/cli.py
21
cbpi/cli.py
|
@ -1,6 +1,7 @@
|
||||||
import logging
|
import logging
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
import requests
|
import requests
|
||||||
|
from cbpi import __version__, __codename__
|
||||||
from cbpi.configFolder import ConfigFolder
|
from cbpi.configFolder import ConfigFolder
|
||||||
from cbpi.utils.utils import load_config
|
from cbpi.utils.utils import load_config
|
||||||
from zipfile import ZipFile
|
from zipfile import ZipFile
|
||||||
|
@ -258,16 +259,26 @@ class CraftBeerPiCli():
|
||||||
@click.pass_context
|
@click.pass_context
|
||||||
@click.option('--config-folder-path', '-c', default="./config", type=click.Path(), help="Specify where the config folder is located. Defaults to './config'.")
|
@click.option('--config-folder-path', '-c', default="./config", type=click.Path(), help="Specify where the config folder is located. Defaults to './config'.")
|
||||||
@click.option('--logs-folder-path', '-l', default="", type=click.Path(), help="Specify where the log folder is located. Defaults to '../logs' relative from the config folder.")
|
@click.option('--logs-folder-path', '-l', default="", type=click.Path(), help="Specify where the log folder is located. Defaults to '../logs' relative from the config folder.")
|
||||||
@click.option('--debug-log-level', '-d', default="30", type=int, help="Specify the log level you want to write to all logs. 0=ALL, 10=DEBUG, 20=INFO 30(default)=WARNING, 40=ERROR, 50=CRITICAL")
|
@click.option('--debug-log-level', '-d', default="99", type=int, help="Specify the log level you want to write to all logs. 0=ALL, 10=DEBUG, 20=INFO 30(default)=WARNING, 40=ERROR, 50=CRITICAL. Can be also set in config.yaml (debug-log-level: INT)")
|
||||||
def main(context, config_folder_path, logs_folder_path, debug_log_level):
|
def main(context, config_folder_path, logs_folder_path, debug_log_level):
|
||||||
print("---------------------")
|
print("--------------------------")
|
||||||
print("Welcome to CBPi")
|
print("Welcome to CBPi "+__version__)
|
||||||
print("---------------------")
|
print("--------------------------")
|
||||||
if logs_folder_path == "":
|
if logs_folder_path == "":
|
||||||
logs_folder_path = os.path.join(Path(config_folder_path).absolute().parent, 'logs')
|
logs_folder_path = os.path.join(Path(config_folder_path).absolute().parent, 'logs')
|
||||||
formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(name)s - %(message)s')
|
formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(name)s - %(message)s')
|
||||||
|
static_config = load_config(ConfigFolder(config_folder_path, logs_folder_path).get_file_path("config.yaml"))
|
||||||
|
try:
|
||||||
|
if debug_log_level == 99:
|
||||||
|
debug_log_level=static_config['debug-log-level']
|
||||||
|
except:
|
||||||
|
debug_log_level=30
|
||||||
|
|
||||||
logging.basicConfig(format=formatter, stream=logging.StreamHandler())
|
logging.basicConfig(format=formatter, stream=logging.StreamHandler())
|
||||||
logger = logging.getLogger()
|
logger = logging.getLogger()
|
||||||
|
print("*******************************")
|
||||||
|
print("Set Debug-log-level to {}".format(debug_log_level))
|
||||||
|
print("*******************************")
|
||||||
logger.setLevel(debug_log_level)
|
logger.setLevel(debug_log_level)
|
||||||
try:
|
try:
|
||||||
if not os.path.isdir(logs_folder_path):
|
if not os.path.isdir(logs_folder_path):
|
||||||
|
@ -292,7 +303,7 @@ def setup(context):
|
||||||
@click.option('--list', is_flag=True, help="List all 1Wire Devices")
|
@click.option('--list', is_flag=True, help="List all 1Wire Devices")
|
||||||
@click.option('--setup', is_flag=True, help="Setup 1Wire on Raspberry Pi")
|
@click.option('--setup', is_flag=True, help="Setup 1Wire on Raspberry Pi")
|
||||||
def onewire(context, list, setup):
|
def onewire(context, list, setup):
|
||||||
'''Setup 1wire on Raspberry Pi'''
|
'''(--setup | --list) Setup 1wire on Raspberry Pi or list sensors'''
|
||||||
if setup is True:
|
if setup is True:
|
||||||
context.obj.setup_one_wire()
|
context.obj.setup_one_wire()
|
||||||
if list is True:
|
if list is True:
|
||||||
|
|
|
@ -5,7 +5,7 @@ version: 4.0.8
|
||||||
index_url: /cbpi_ui/static/index.html
|
index_url: /cbpi_ui/static/index.html
|
||||||
|
|
||||||
port: 8000
|
port: 8000
|
||||||
|
debug-log-level: 30
|
||||||
mqtt: false
|
mqtt: false
|
||||||
mqtt_host: localhost
|
mqtt_host: localhost
|
||||||
mqtt_port: 1883
|
mqtt_port: 1883
|
||||||
|
|
Loading…
Reference in a new issue