summaryrefslogtreecommitdiffstats
path: root/core/modules/printergui
diff options
context:
space:
mode:
authorSimon Rettberg2023-06-05 16:17:32 +0200
committerSimon Rettberg2023-06-05 16:17:32 +0200
commit11ac933570a2e67c6028c8031a962fa7cd904ec3 (patch)
treed181d3023eee21b51ab3c3b7f52bbc45f4501eb4 /core/modules/printergui
parent[x11vnc/tigervnc] Seems we shouldn't remove something still in use (diff)
downloadmltk-11ac933570a2e67c6028c8031a962fa7cd904ec3.tar.gz
mltk-11ac933570a2e67c6028c8031a962fa7cd904ec3.tar.xz
mltk-11ac933570a2e67c6028c8031a962fa7cd904ec3.zip
[printergui] Log error via writelog instead of slxlog
Diffstat (limited to 'core/modules/printergui')
-rw-r--r--core/modules/printergui/data/opt/openslx/vmchooser/run-virt.d/setup_printer_lpd.inc9
1 files changed, 6 insertions, 3 deletions
diff --git a/core/modules/printergui/data/opt/openslx/vmchooser/run-virt.d/setup_printer_lpd.inc b/core/modules/printergui/data/opt/openslx/vmchooser/run-virt.d/setup_printer_lpd.inc
index d4c7df07..639b7bca 100644
--- a/core/modules/printergui/data/opt/openslx/vmchooser/run-virt.d/setup_printer_lpd.inc
+++ b/core/modules/printergui/data/opt/openslx/vmchooser/run-virt.d/setup_printer_lpd.inc
@@ -19,7 +19,7 @@ setup_virtual_printer() {
SPOOLDIR="${TMPDIR}/printergui-${RANDOM}"
rm -rf -- "${SPOOLDIR}"
if ! mkdir -p "${SPOOLDIR}/${QUEUE}"; then
- slxlog "virt-spooldir" "Could not create spool directory ($SPOOLDIR) for $USER - printing will not work!"
+ writelog "Could not mkdir -p '${SPOOLDIR}/${QUEUE}'"
notify_user "Drucksystem" "Das Drucksystem konnte nicht initialisiert werden. Druckfunktion nicht verfügbar."
fi
chmod 0700 "${SPOOLDIR}/${QUEUE}"
@@ -29,7 +29,9 @@ setup_virtual_printer() {
# TODO: externalize with something like runvirt.d (other parts might benefit from that too)
tcpsvd -E 192.168.101.1 5515 \
lpd "$SPOOLDIR" \
- ash -c "/opt/openslx/scripts/run-virt_print '${USER}' \"${SPOOLDIR}/${QUEUE}/\$DATAFILE\"" &
+ ash -c "/opt/openslx/scripts/run-virt_print '${USER}' \"${SPOOLDIR}/${QUEUE}/\$DATAFILE\"" \
+ &> "${TMPDIR}/tcpsvd.log" \
+ &
# PID to kill the process
declare -rg PID_LPD="$!"
@@ -41,7 +43,8 @@ setup_virtual_printer() {
# success even if it's not really working.
if ! kill -0 "$PID_LPD"; then
- slxlog "virt-lpd" "Could not start tcpsvd/lpd for virtual machine session"
+ writelog "Could not start tcpsvd/lpd for virtual machine session:"
+ writelog "$( cat "${TMPDIR}/tcpsvd.log" )"
notify_user "Drucksystem" "Das Drucksystem konnte nicht initialisiert werden. Druckfunktion nicht verfügbar."
fi
} &