Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions backend/beets_flask/logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"format": "[%(levelname)s] %(name)s: %(message)s"
},
"debug": {
"format": "%(relativeCreated)-8d [%(levelname)-5s] %(name)s %(filename)-8s:%(lineno)d %(message)s"
"format": "[%(levelname)-5s] %(asctime)s %(name)s %(filename)-8s:%(lineno)d %(message)s"
},
},
"handlers": {
Expand All @@ -25,8 +25,8 @@
"class": "logging.handlers.RotatingFileHandler",
"level": "DEBUG",
"formatter": "debug",
"filename": os.environ.get("LOG_FILE_WEB", "./beets-flask.log"),
"maxBytes": 1048576, #
"filename": os.environ.get("BEETSFLASKLOG", "./beets-flask.log"),
"maxBytes": 1048576, # 1 MB
"backupCount": 3,
},
},
Expand All @@ -38,7 +38,7 @@
},
"beets-flask": {
"handlers": ["console", "file"],
"level": os.getenv("LOG_LEVEL_BEETSFLASK", logging.DEBUG),
"level": os.getenv("LOG_LEVEL_BEETSFLASK", logging.INFO),
"propagate": False,
},
},
Expand All @@ -49,7 +49,7 @@
# Configure minimal logging for pytest
logging.basicConfig(
level=logging.DEBUG,
format="%(relativeCreated)-8d [%(levelname)-5s] %(name)s %(filename)-8s:%(lineno)d %(message)s",
format="[%(levelname)-5s] %(asctime)s %(name)s %(filename)-8s:%(lineno)d %(message)s",
)
else:
logging.config.dictConfig(LOGGING_CONFIG)
Expand Down
5 changes: 3 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,16 @@ ENV HOSTNAME="beets-container"
# map beets directory and our configs to /config
RUN mkdir -p /config/beets
RUN mkdir -p /config/beets-flask
RUN mkdir -p /logs
RUN chown -R beetle:beetle /config
RUN chown -R beetle:beetle /logs
ENV BEETSDIR="/config/beets"
ENV BEETSFLASKDIR="/config/beets-flask"
ENV LOG_FILE_WEB="/repo/log/web.log"
ENV BEETSFLASKLOG="/logs/beets-flask.log"

# our default folders they should not be used in production
RUN mkdir -p /music/inbox
RUN mkdir -p /music/imported
RUN mkdir -p /repo/log
RUN chown -R beetle:beetle /music

# dependencies
Expand Down
4 changes: 4 additions & 0 deletions docker/docker-compose.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,9 @@ services:
# get permission issues.
- ../local/config/:/config

# For debugging purposes, you can also mount the logs directory
# for instance if you want to report an issue
- ../local/logs/:/logs

# for development. (disable if target is `prod`)
- ../:/repo/
2 changes: 2 additions & 0 deletions docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ services:
# for music folders, match paths inside and out of container!
- /music_path/inbox/:/music_path/inbox/
- /music_path/clean/:/music_path/clean/
# If you want to persist the logs, you can mount a logs directory
# - /wherever/logs/:/logs
2 changes: 2 additions & 0 deletions docker/entrypoints/entrypoint_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ python ./launch_redis_workers.py

redis-cli FLUSHALL

# This might be broken! Not sure where this entrypoint is even used!
# log dir changed!
mkdir -p /repo/log
rm /repo/log/for_web.log >/dev/null 2>&1
rm /repo/frontend/vite.config.ts.timestamp-*.mjs >/dev/null 2>&1
Expand Down
1 change: 1 addition & 0 deletions docs/develop/resources/backend.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ The configuration folders can be set via environment variables. This might be us
```
BEETSDIR="/config/beets"
BEETSFLASKDIR="/config/beets-flask"
BEETSFLASKLOG="/logs/beets-flask.log"
```


Loading