From b1bf9275cf54612d41676248cca724c492fbf473 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 16 Feb 2023 11:56:45 +0100
Subject: [hardware-stats] Increase timeouts again

---
 .../hardware-stats/data/opt/openslx/scripts/cron-system_usage_update   | 3 ++-
 .../hardware-stats/data/opt/openslx/scripts/systemd-hardware_report    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'core/modules/hardware-stats')

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 c3638006..1b2ab1ae 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
@@ -100,7 +100,8 @@ fi
 # or if the cron-job hasn't been set up yet.
 # Do this right before the curl call to minimize odds for a race condition
 if [ -e "/etc/cron.d/usage_stats" ] && ! [ -e "/run/openslx/shutdown.mutex" ]; then
-	curl --retry 3 --retry-connrefused -m 6 -s --data-urlencode "type=~runstate" --data-urlencode "uuid=$UUID" \
+	curl --retry 3 --retry-connrefused --connect-timeout 3 --max-time 15 --retry-max-time 20 -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 "id45size=$ID45_SIZE" --data-urlencode "id45free=$ID45_FREE" \
diff --git a/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_report b/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_report
index 5a93742e..464b9742 100755
--- a/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_report
+++ b/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_report
@@ -62,7 +62,7 @@ report_hardware_info() {
 	# got everything, get the last infos
 	uptime=$(grep -oE '^[0-9]+' /proc/uptime)
 	echo -n "Submitting to '$SLX_REMOTE_LOG' ... "
-	curl --retry 4 --retry-connrefused --max-time 8 --retry-max-time 15 \
+	curl --retry 4 --retry-connrefused --connect-timeout 3 --max-time 9 --retry-max-time 18 \
 		--data-urlencode "type=~poweron" --data-urlencode "uuid=$uuid" --data-urlencode "macaddr=$HW_MAC" \
 		--data-urlencode "uptime=$uptime" --data-urlencode "realcores=$HW_CORES" \
 		--data-urlencode "vcores=$HW_THREADS" \
-- 
cgit v1.2.3-55-g7522