diff --git a/README.md b/README.md index 1046bbb..d844a3e 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Variable | Default | Description `CONFIG_FILE` | `/config/infrasonar.yaml` | File with configuration like credentials. `USE_DEVELOPMENT` | `0` | Use the development environment. `SERVICE_NAME` | `rapp` | Name of the "rapp" service withing the compose file. -`PROJECT_NAME` | _none_ | Force a docker compose project name _(not recommended)_. +`PROJECT_NAME` | _none_ | Force a docker compose project name (if not set, we assume the project name is _infrasonar_) _(not recommended to set explicitly)_. `LOG_LEVEL` | `warning` | Log level (`debug`, `info`, `warning`, `error` or `critical`). `LOG_COLORIZED` | `0` | Log using colors (`0`=disabled, `1`=enabled). `LOG_FTM` | `%y%m%d %H:%M:%S` | Log format prefix. diff --git a/lib/state.py b/lib/state.py index 7ac4ce7..cc4c7ff 100644 --- a/lib/state.py +++ b/lib/state.py @@ -6,7 +6,8 @@ from configobj import ConfigObj from typing import Set, List, Dict from .docker import Docker -from .envvars import COMPOSE_FILE, CONFIG_FILE, ENV_FILE, USE_DEVELOPMENT +from .envvars import ( + COMPOSE_FILE, CONFIG_FILE, ENV_FILE, USE_DEVELOPMENT, PROJECT_NAME) from .logview import LogView RE_VAR = re.compile(r'^[_a-zA-Z][_0-9a-zA-Z]{0,40}$') @@ -100,7 +101,7 @@ async def _init(cls): @classmethod async def get_log(cls, name: str, start: int = 0): - cname = f'infrasonar-{name}-1' + cname = f'{PROJECT_NAME}-{name}-1' logger = cls.loggers.get(cname) if logger is None: start = 0