diff options
| author | Simon Rettberg | 2023-03-07 16:04:39 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2023-03-07 16:04:39 +0100 |
| commit | 912eae8f35361a3aea0fd10fccff8fbf81fbac06 (patch) | |
| tree | ac11c3879d31db6d9c02fd71315f2cae4415fe80 /core/modules/hardware-stats | |
| parent | [debug-report-bwlp] Include root's xsession-errors (diff) | |
| download | mltk-912eae8f35361a3aea0fd10fccff8fbf81fbac06.tar.gz mltk-912eae8f35361a3aea0fd10fccff8fbf81fbac06.tar.xz mltk-912eae8f35361a3aea0fd10fccff8fbf81fbac06.zip | |
[hardware-stats] Let any errors go to stdout
Diffstat (limited to 'core/modules/hardware-stats')
| -rwxr-xr-x | core/modules/hardware-stats/data/opt/openslx/scripts/cron-system_usage_update | 4 |
1 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 1b2ab1ae..b3c89458 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,7 @@ 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 --connect-timeout 3 --max-time 15 --retry-max-time 20 -s \ + curl --retry 3 --retry-connrefused --connect-timeout 3 --max-time 15 --retry-max-time 20 -sS \ --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" \ @@ -108,7 +108,7 @@ if [ -e "/etc/cron.d/usage_stats" ] && ! [ -e "/run/openslx/shutdown.mutex" ]; t --data-urlencode "swapsize=$SWAP_SIZE" --data-urlencode "swapfree=$SWAP_FREE" \ --data-urlencode "memsize=$MEM_SIZE" --data-urlencode "memfree=$MEM_FREE" \ "$@" \ - "$SLX_REMOTE_LOG" > /dev/null 2>&1 + "$SLX_REMOTE_LOG" | grep -v 'RESULT=0' fi # Warn user if tmp or swap usage is high; system might crash soon |