Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: replace click envar with auto_envvar_prefix (#1829)

This commit is contained in:
Jonas L 2022-05-05 09:41:32 +02:00 committed by GitHub
parent 623655e3d0
commit d098671f3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
analyzer/libretime_analyzer/main.py
View File

@ -15,12 +15,11 @@ VERSION = "1.0"
DEFAULT_RETRY_QUEUE_FILEPATH = Path("retry_queue") DEFAULT_RETRY_QUEUE_FILEPATH = Path("retry_queue")
@click.command() @click.command(context_settings={"auto_envvar_prefix": DEFAULT_ENV_PREFIX})
@cli_logging_options() @cli_logging_options()
@cli_config_options() @cli_config_options()
@click.option( @click.option(
"--retry-queue-filepath", "--retry-queue-filepath",
envvar=f"{DEFAULT_ENV_PREFIX}_RETRY_QUEUE_FILEPATH",
type=click.Path(path_type=Path), type=click.Path(path_type=Path),
help="Path to the retry queue file.", help="Path to the retry queue file.",
default=DEFAULT_RETRY_QUEUE_FILEPATH, default=DEFAULT_RETRY_QUEUE_FILEPATH,

3
playout/libretime_liquidsoap/main.py
View File

@ -7,13 +7,14 @@ from typing import Optional
import click import click
from libretime_shared.cli import cli_logging_options from libretime_shared.cli import cli_logging_options
from libretime_shared.config import DEFAULT_ENV_PREFIX
from libretime_shared.logging import level_from_name, setup_logger from libretime_shared.logging import level_from_name, setup_logger
from loguru import logger from loguru import logger
from . import generate_liquidsoap_cfg from . import generate_liquidsoap_cfg
@click.command() @click.command(context_settings={"auto_envvar_prefix": DEFAULT_ENV_PREFIX})
@cli_logging_options() @cli_logging_options()
def cli(log_level: int, log_filepath: Optional[Path]): def cli(log_level: int, log_filepath: Optional[Path]):
""" """

2
playout/libretime_playout/main.py
View File

@ -112,7 +112,7 @@ def liquidsoap_startup_test(telnet_lock, liquidsoap_host, liquidsoap_port):
logger.info("Liquidsoap version string found %s" % liquidsoap_version_string) logger.info("Liquidsoap version string found %s" % liquidsoap_version_string)
@click.command() @click.command(context_settings={"auto_envvar_prefix": DEFAULT_ENV_PREFIX})
@cli_logging_options() @cli_logging_options()
@cli_config_options() @cli_config_options()
def cli(log_level: str, log_filepath: Optional[Path], config_filepath: Optional[Path]): def cli(log_level: str, log_filepath: Optional[Path], config_filepath: Optional[Path]):

3
playout/libretime_playout/notify/main.py
View File

@ -18,6 +18,7 @@ from typing import Optional
import click import click
from libretime_api_client.version1 import AirtimeApiClient from libretime_api_client.version1 import AirtimeApiClient
from libretime_shared.cli import cli_logging_options from libretime_shared.cli import cli_logging_options
from libretime_shared.config import DEFAULT_ENV_PREFIX
from libretime_shared.logging import level_from_name, setup_logger from libretime_shared.logging import level_from_name, setup_logger
from loguru import logger from loguru import logger
@ -26,7 +27,7 @@ def api_client():
return AirtimeApiClient(logger=logger) return AirtimeApiClient(logger=logger)
@click.group() @click.group(context_settings={"auto_envvar_prefix": DEFAULT_ENV_PREFIX})
@cli_logging_options() @cli_logging_options()
def cli(log_level: str, log_filepath: Optional[Path]): def cli(log_level: str, log_filepath: Optional[Path]):
""" """

4
shared/libretime_shared/cli.py
View File

@ -3,7 +3,6 @@ from typing import Any, Callable, Optional
import click import click
from .config import DEFAULT_ENV_PREFIX
from .logging import INFO, LOG_LEVEL_MAP from .logging import INFO, LOG_LEVEL_MAP
@ -19,7 +18,6 @@ def cli_logging_options() -> Callable:
func = click.option( func = click.option(
"--log-level", "--log-level",
"log_level", "log_level",
envvar=f"{DEFAULT_ENV_PREFIX}_LOG_LEVEL",
type=click.Choice(list(LOG_LEVEL_MAP.keys())), type=click.Choice(list(LOG_LEVEL_MAP.keys())),
default=INFO.name, default=INFO.name,
help="Name of the logging level.", help="Name of the logging level.",
@ -28,7 +26,6 @@ def cli_logging_options() -> Callable:
func = click.option( func = click.option(
"--log-filepath", "--log-filepath",
"log_filepath", "log_filepath",
envvar=f"{DEFAULT_ENV_PREFIX}_LOG_FILEPATH",
type=click.Path(path_type=Path), type=click.Path(path_type=Path),
help="Path to the logging file.", help="Path to the logging file.",
default=None, default=None,
@ -55,7 +52,6 @@ def cli_config_options(
"--c", "--c",
"--config", "--config",
"config_filepath", "config_filepath",
envvar=f"{DEFAULT_ENV_PREFIX}_CONFIG_FILEPATH",
type=click.Path(path_type=Path), type=click.Path(path_type=Path),
help="Path to the config file.", help="Path to the config file.",
required=required, required=required,