Skip to content

Commit dc78fda

Browse files
authored
[Feature] Configure logging #152 (#153)
1 parent ef19280 commit dc78fda

File tree

3 files changed

+24
-4
lines changed

3 files changed

+24
-4
lines changed

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ ENV LIBREFM_PASSWORD ""
144144
ENV JAMENDO_USERNAME ""
145145
ENV JAMENDO_PASSWORD ""
146146

147+
ENV MPD_ENABLE_LOGGING ""
147148
ENV MPD_LOG_LEVEL ""
148149
ENV SCRIBBLE_VERBOSE ""
149150

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ SCRIBBLE_VERBOSE||How verbose `mpdscribble`'s logging should be. Default is 1.
183183
SCROBBLER_MPD_HOSTNAME||Set when using host mode, defaults to `localhost`
184184
SCROBBLER_MPD_PORT||Set when using host mode, defaults to `6600`
185185
PROXY||Proxy support for `mpdscribble`. Example value: `http://the.proxy.server:3128`
186+
MPD_ENABLE_LOGGING||Defaults to `yes`, set to `no` to disable
186187
MPD_LOG_LEVEL||Can be `default` or `verbose`
187188
ZEROCONF_ENABLED||Set to `yes` to enable. Disabled by default.
188189
ZEROCONF_NAME||Set zeroconf name, used only if `ZEROCONF_ENABLED` is set to `yes`
@@ -284,6 +285,7 @@ Just be careful to use the tag you have built.
284285

285286
Date|Major Changes
286287
:---|:---
288+
2022-12-17|Add `MPD_ENABLE_LOGGING`
287289
2022-12-16|Preset `fiio-e18` now includes mixer
288290
2022-12-16|Code cleanup
289291
2022-12-14|Creation of `audio` group also for `pulse` mode if `AUDIO_GID` is specified

app/bin/run-mpd.sh

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,27 @@ echo "state_file_interval \"${state_file_interval}\"" >> $MPD_ALSA_CONFIG_FILE
214214
echo "sticker_file \"/db/sticker\"" >> $MPD_ALSA_CONFIG_FILE
215215
echo "bind_to_address \"${MPD_BIND_ADDRESS}\"" >> $MPD_ALSA_CONFIG_FILE
216216
echo "port \"${MPD_PORT}\"" >> $MPD_ALSA_CONFIG_FILE
217-
echo "log_file \"/log/mpd.log\"" >> $MPD_ALSA_CONFIG_FILE
217+
218+
logging_enabled=1
219+
if [ -n "${MPD_ENABLE_LOGGING}" ]; then
220+
if [[ "${MPD_ENABLE_LOGGING^^}" == "NO" ||
221+
"${MPD_ENABLE_LOGGING^^}" == "N" ]]; then
222+
logging_enabled=0
223+
elif [[ "${MPD_ENABLE_LOGGING^^}" != "YES" &&
224+
"${MPD_ENABLE_LOGGING^^}" != "Y" ]]; then
225+
echo "Invalid MPD_ENABLE_LOGGING=[${MPD_ENABLE_LOGGING}]"
226+
exit 9
227+
fi
228+
fi
229+
230+
if [ $logging_enabled -eq 1 ]; then
231+
echo "log_file \"/log/mpd.log\"" >> $MPD_ALSA_CONFIG_FILE
232+
if [ -n "${MPD_LOG_LEVEL}" ]; then
233+
echo "log_level \"${MPD_LOG_LEVEL}\"" >> $MPD_ALSA_CONFIG_FILE
234+
fi
235+
else
236+
echo "Logging is disabled because MPD_ENABLE_LOGGING is set to [${MPD_ENABLE_LOGGING}]"
237+
fi
218238

219239
if [[ "${ZEROCONF_ENABLED^^}" == "YES" || "${ZEROCONF_ENABLED^^}" == "Y" ]]; then
220240
ZEROCONF_ENABLED=yes
@@ -228,9 +248,6 @@ if [ -n "${ZEROCONF_NAME}" ]; then
228248
echo "zeroconf_name \"${ZEROCONF_NAME}\"" >> $MPD_ALSA_CONFIG_FILE
229249
fi
230250

231-
if [ -n "${MPD_LOG_LEVEL}" ]; then
232-
echo "log_level \"${MPD_LOG_LEVEL}\"" >> $MPD_ALSA_CONFIG_FILE
233-
fi
234251

235252
## disable wildmidi decoder
236253
echo "decoder {" >> $MPD_ALSA_CONFIG_FILE

0 commit comments

Comments
 (0)