summaryrefslogtreecommitdiffstats
path: root/core/modules/pvs2
diff options
context:
space:
mode:
authorSimon Rettberg2022-10-27 12:16:44 +0200
committerSimon Rettberg2022-10-27 12:16:44 +0200
commit06fef33e16284f113f41e5062a156db86ef28df8 (patch)
tree73194bd8b3869297eea5bfde50a6904ea3504b78 /core/modules/pvs2
parent[dnbd3-proxy-mode] Fix syntax error in cron file (diff)
downloadmltk-06fef33e16284f113f41e5062a156db86ef28df8.tar.gz
mltk-06fef33e16284f113f41e5062a156db86ef28df8.tar.xz
mltk-06fef33e16284f113f41e5062a156db86ef28df8.zip
[pvs2] Log output to /tmp
Diffstat (limited to 'core/modules/pvs2')
-rwxr-xr-xcore/modules/pvs2/data/opt/openslx/bin/pvsstartup3
-rwxr-xr-xcore/modules/pvs2/data/opt/openslx/scripts/setup-pvsmgr2
2 files changed, 3 insertions, 2 deletions
diff --git a/core/modules/pvs2/data/opt/openslx/bin/pvsstartup b/core/modules/pvs2/data/opt/openslx/bin/pvsstartup
index e5da0a0c..0207c268 100755
--- a/core/modules/pvs2/data/opt/openslx/bin/pvsstartup
+++ b/core/modules/pvs2/data/opt/openslx/bin/pvsstartup
@@ -15,6 +15,7 @@ DIR=$(mktemp -d)
[ -n "$DIR" ] && cd "$DIR"
ulimit -c unlimited
+exec &> "/tmp/xsession-log-pvsclient-$(date +%s)-$$"
while [ $timediff -gt 3 ]; do
start="$(date +%s)"
@@ -23,7 +24,7 @@ while [ $timediff -gt 3 ]; do
end="$(date +%s)"
[ "$ret" = 139 ] && for c in core*; do
[ -f "$c" ] || continue
- tar ckzf "cmp-${c}.tgz" "$c"
+ tar ckzf "cmp-${c}.tgz" "$c" "/opt/openslx/.mltk/pvs2.git" "/etc/issue"
curl -m 3 -H "Expect:" -f -s -S -F "file=@cmp-${c}.tgz;filename=report" "$URL" &> /dev/null
rm -f -- "$c" "cmp-${c}.tgz"
done
diff --git a/core/modules/pvs2/data/opt/openslx/scripts/setup-pvsmgr b/core/modules/pvs2/data/opt/openslx/scripts/setup-pvsmgr
index 5531518a..50f691ff 100755
--- a/core/modules/pvs2/data/opt/openslx/scripts/setup-pvsmgr
+++ b/core/modules/pvs2/data/opt/openslx/scripts/setup-pvsmgr
@@ -17,7 +17,7 @@ counter=0
while [ $timediff -gt 3 ]; do
start="$(date +%s)"
- /opt/openslx/bin/pvsmgr "$CONF" "$@"
+ /opt/openslx/bin/pvsmgr "$CONF" "$@" &> "/tmp/xsession-log-pvsmgr-$(date +%s)-$$"
ret=$?
[ "$ret" == "0" ] && break
end="$(date +%s)"