Skip to content

Commit b085677

Browse files
authored
Fix log directory and level (#77)
* Replace "WEB_LOG" variable with "BEETSFLASKLOG" as we do not have a web log anymore. Also changed the default folder of the logs for docker builds. * Changed default log level from debug to info
1 parent 1ad1e7c commit b085677

File tree

6 files changed

+17
-7
lines changed

6 files changed

+17
-7
lines changed

backend/beets_flask/logger.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"format": "[%(levelname)s] %(name)s: %(message)s"
1212
},
1313
"debug": {
14-
"format": "%(relativeCreated)-8d [%(levelname)-5s] %(name)s %(filename)-8s:%(lineno)d %(message)s"
14+
"format": "[%(levelname)-5s] %(asctime)s %(name)s %(filename)-8s:%(lineno)d %(message)s"
1515
},
1616
},
1717
"handlers": {
@@ -25,8 +25,8 @@
2525
"class": "logging.handlers.RotatingFileHandler",
2626
"level": "DEBUG",
2727
"formatter": "debug",
28-
"filename": os.environ.get("LOG_FILE_WEB", "./beets-flask.log"),
29-
"maxBytes": 1048576, #
28+
"filename": os.environ.get("BEETSFLASKLOG", "./beets-flask.log"),
29+
"maxBytes": 1048576, # 1 MB
3030
"backupCount": 3,
3131
},
3232
},
@@ -38,7 +38,7 @@
3838
},
3939
"beets-flask": {
4040
"handlers": ["console", "file"],
41-
"level": os.getenv("LOG_LEVEL_BEETSFLASK", logging.DEBUG),
41+
"level": os.getenv("LOG_LEVEL_BEETSFLASK", logging.INFO),
4242
"propagate": False,
4343
},
4444
},
@@ -49,7 +49,7 @@
4949
# Configure minimal logging for pytest
5050
logging.basicConfig(
5151
level=logging.DEBUG,
52-
format="%(relativeCreated)-8d [%(levelname)-5s] %(name)s %(filename)-8s:%(lineno)d %(message)s",
52+
format="[%(levelname)-5s] %(asctime)s %(name)s %(filename)-8s:%(lineno)d %(message)s",
5353
)
5454
else:
5555
logging.config.dictConfig(LOGGING_CONFIG)

docker/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ ENV HOSTNAME="beets-container"
1111
# map beets directory and our configs to /config
1212
RUN mkdir -p /config/beets
1313
RUN mkdir -p /config/beets-flask
14+
RUN mkdir -p /logs
1415
RUN chown -R beetle:beetle /config
16+
RUN chown -R beetle:beetle /logs
1517
ENV BEETSDIR="/config/beets"
1618
ENV BEETSFLASKDIR="/config/beets-flask"
17-
ENV LOG_FILE_WEB="/repo/log/web.log"
19+
ENV BEETSFLASKLOG="/logs/beets-flask.log"
1820

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

2526
# dependencies

docker/docker-compose.dev.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,9 @@ services:
2828
# get permission issues.
2929
- ../local/config/:/config
3030

31+
# For debugging purposes, you can also mount the logs directory
32+
# for instance if you want to report an issue
33+
- ../local/logs/:/logs
34+
3135
# for development. (disable if target is `prod`)
3236
- ../:/repo/

docker/docker-compose.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ services:
1313
# for music folders, match paths inside and out of container!
1414
- /music_path/inbox/:/music_path/inbox/
1515
- /music_path/clean/:/music_path/clean/
16+
# If you want to persist the logs, you can mount a logs directory
17+
# - /wherever/logs/:/logs

docker/entrypoints/entrypoint_test.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ python ./launch_redis_workers.py
1212

1313
redis-cli FLUSHALL
1414

15+
# This might be broken! Not sure where this entrypoint is even used!
16+
# log dir changed!
1517
mkdir -p /repo/log
1618
rm /repo/log/for_web.log >/dev/null 2>&1
1719
rm /repo/frontend/vite.config.ts.timestamp-*.mjs >/dev/null 2>&1

docs/develop/resources/backend.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ The configuration folders can be set via environment variables. This might be us
2121
```
2222
BEETSDIR="/config/beets"
2323
BEETSFLASKDIR="/config/beets-flask"
24+
BEETSFLASKLOG="/logs/beets-flask.log"
2425
```
2526

2627

0 commit comments

Comments
 (0)