mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-20 11:11:43 -04:00
2f2010f63c
msmtpq patches had to be recreated: - removal of the executable check and addition of systemd logging were kept and split into two patches. - renaming of queue and log files was removed as the upstream script had renamed these to add the `MSMTPQ_` prefix (noted as a backwards incompatible change).
42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq
|
|
index bcb384e..dbaf1b5 100755
|
|
--- a/scripts/msmtpq/msmtpq
|
|
+++ b/scripts/msmtpq/msmtpq
|
|
@@ -92,6 +92,8 @@ if [ ! -v MSMTPQ_LOG ] ; then
|
|
fi
|
|
fi
|
|
[ -d "$(dirname "$MSMTPQ_LOG")" ] || mkdir -p "$(dirname "$MSMTPQ_LOG")"
|
|
+
|
|
+JOURNAL=@journal@
|
|
## ======================================================================================
|
|
|
|
## msmtpq can use the following environment variables :
|
|
@@ -144,6 +146,7 @@ on_exit() { # unlock the queue on exit if the lock was
|
|
## display msg to user, as well
|
|
##
|
|
log() {
|
|
+ local NAME=msmtpq
|
|
local ARG RC PFX
|
|
PFX="$('date' +'%Y %d %b %H:%M:%S')"
|
|
# time stamp prefix - "2008 13 Mar 03:59:45 "
|
|
@@ -161,10 +164,19 @@ log() {
|
|
done
|
|
fi
|
|
|
|
+ if [ "$JOURNAL" = "Y" ]; then
|
|
+ for ARG; do
|
|
+ [ -n "$ARG" ] &&
|
|
+ echo "$ARG" | systemd-cat -t "$NAME" -p info
|
|
+ done
|
|
+ fi
|
|
+
|
|
if [ -n "$RC" ] ; then # an error ; leave w/error return
|
|
[ -n "$LKD" ] && lock_queue -u # unlock here (if locked)
|
|
[ -n "$MSMTPQ_LOG" ] && \
|
|
echo " exit code = $RC" >> "$MSMTPQ_LOG" # logging ok ; send exit code to log
|
|
+ [ "$JOURNAL" = "Y" ] && \
|
|
+ echo "exit code= $RC" | systemd-cat -t "$NAME" -p emerg
|
|
exit "$RC" # exit w/return code
|
|
fi
|
|
}
|