diff options
| author | Simon Rettberg | 2019-03-20 14:50:58 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-03-20 14:50:58 +0100 |
| commit | 61f5d81760d19bbcf31caa5830f4129ffd8d012f (patch) | |
| tree | 6a133a79c59ce94b4e3c980af55baa8e975782ea | |
| parent | [hardware-stats] Filter a few more bogus system model names (diff) | |
| download | mltk-61f5d81760d19bbcf31caa5830f4129ffd8d012f.tar.gz mltk-61f5d81760d19bbcf31caa5830f4129ffd8d012f.tar.xz mltk-61f5d81760d19bbcf31caa5830f4129ffd8d012f.zip | |
[hardware-stats] curl: Retry harder
| -rwxr-xr-x | core/modules/hardware-stats/data/opt/openslx/scripts/cron-system_usage_update | 2 | ||||
| -rwxr-xr-x | core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/modules/hardware-stats/data/opt/openslx/scripts/cron-system_usage_update b/core/modules/hardware-stats/data/opt/openslx/scripts/cron-system_usage_update index 84008785..89df8e74 100755 --- a/core/modules/hardware-stats/data/opt/openslx/scripts/cron-system_usage_update +++ b/core/modules/hardware-stats/data/opt/openslx/scripts/cron-system_usage_update @@ -41,7 +41,7 @@ if [ -n "$SLX_EXAM" ]; then SLX_RUNMODE_MODULE="exams" fi -curl --retry 3 --retry-connrefused -s --data-urlencode "type=~runstate" --data-urlencode "uuid=$UUID" --data-urlencode "used=$USED" \ +curl --retry 3 --retry-connrefused -m 6 -s --data-urlencode "type=~runstate" --data-urlencode "uuid=$UUID" --data-urlencode "used=$USED" \ --data-urlencode "user=$Name" --data-urlencode "tmpsize=$TMP_SIZE" --data-urlencode "tmpfree=$TMP_FREE" \ --data-urlencode "swapsize=$SWAP_SIZE" --data-urlencode "swapfree=$SWAP_FREE" \ --data-urlencode "memsize=$MEM_SIZE" --data-urlencode "memfree=$MEM_FREE" \ diff --git a/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats b/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats index a32dcd91..3d6b6539 100755 --- a/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats +++ b/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats @@ -343,7 +343,7 @@ buildlogfile & # Fire away echo "Submitting to $SLX_REMOTE_LOG" -if curl --retry 4 --retry-connrefused \ +if curl --retry 4 --retry-connrefused --max-time 5 --retry-max-time 15 \ --data-urlencode "type=~poweron" --data-urlencode "uuid=$UUID" --data-urlencode "macaddr=$MAC" \ --data-urlencode "uptime=$UPTIME" --data-urlencode "realcores=$CPUCORES" --data-urlencode "mbram=$RAM" \ --data-urlencode "kvmstate=$VT" --data-urlencode "cpumodel=$CPUMODEL" --data-urlencode "id44mb=$ID44" \ |