diff options
| author | Simon Rettberg | 2023-02-13 14:41:14 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2023-02-13 14:41:14 +0100 |
| commit | 263e6f5b1e188acaa92821febf270db8a4611d1b (patch) | |
| tree | 00a3d79cfa1136119f8d1e1cafea72f915027fff /core/modules/run-virt/data | |
| parent | [bwlp-stage4-tweaks] Speed up pswap (diff) | |
| download | mltk-263e6f5b1e188acaa92821febf270db8a4611d1b.tar.gz mltk-263e6f5b1e188acaa92821febf270db8a4611d1b.tar.xz mltk-263e6f5b1e188acaa92821febf270db8a4611d1b.zip | |
[run-virt] Don't slxlog, include curl log in main log instead, increase timeout
Diffstat (limited to 'core/modules/run-virt/data')
| -rw-r--r-- | core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc index 15a89672..956cce0f 100644 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc @@ -37,7 +37,7 @@ download_metadata_default() { WLOG="$TMPDIR/curl-metadata.log" CMDLINE= curl --help | grep -q -- --retry-connrefused && CMDLINE="--retry-connrefused" - curl -L -o "$TMPFILE" -w '\nretval:%{http_code}\n' --retry 3 $CMDLINE --max-time 6 --retry-max-time 15 "${url_lecture_metadata}" &> "$WLOG" + curl -L -o "$TMPFILE" -w '\nretval:%{http_code}\n' --retry 3 $CMDLINE --max-time 8 --retry-max-time 15 "${url_lecture_metadata}" &> "$WLOG" ERRCODE=$( awk -F: '{ if ($1 == "retval") print $2 }' "$WLOG" ) RET=$? if [ "$RET" = 0 ] && [ -n "$ERRCODE" ] && [ "$ERRCODE" -ge 200 ] && [ "$ERRCODE" -lt 300 ]; then @@ -48,8 +48,9 @@ download_metadata_default() { rm -rf -- "$TMPFILE" writelog "Extracting metadata.tgz failed. Cannot start VM." else - writelog "Downloading metadata.tgz failed (RET=$RET, HTTP=$ERRCODE). Cannot start VM." "$WLOG" - slxlog "run-virt-vmx" "Downloading metadata.tgz failed (RET=$RET, HTTP=$ERRCODE). Cannot start VM." "$WLOG" + writelog "Downloading metadata.tgz failed (RET=$RET, HTTP=$ERRCODE). Cannot start VM. +$( cat $WLOG )" + # fi } |