diff options
| author | Simon Rettberg | 2019-02-28 12:31:05 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-02-28 12:31:05 +0100 |
| commit | 9d618470521325b11ac21a96104876136f96df45 (patch) | |
| tree | c27af3eab2cbdef3a79e1c73b0352cdb449182e6 | |
| parent | [beamergui] Remove old unused script (diff) | |
| download | mltk-9d618470521325b11ac21a96104876136f96df45.tar.gz mltk-9d618470521325b11ac21a96104876136f96df45.tar.xz mltk-9d618470521325b11ac21a96104876136f96df45.zip | |
[hardware-stats] Fiddle with service file again
| -rw-r--r-- | core/modules/hardware-stats/data/etc/systemd/system/shutdown-usage-log.service | 4 | ||||
| -rwxr-xr-x | core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/core/modules/hardware-stats/data/etc/systemd/system/shutdown-usage-log.service b/core/modules/hardware-stats/data/etc/systemd/system/shutdown-usage-log.service index e91c6db6..7143a597 100644 --- a/core/modules/hardware-stats/data/etc/systemd/system/shutdown-usage-log.service +++ b/core/modules/hardware-stats/data/etc/systemd/system/shutdown-usage-log.service @@ -2,11 +2,13 @@ Description=Tell server we're shutting down DefaultDependencies=no Before=shutdown.target +Requires=network-online.target After=-.mount network-online.target RefuseManualStart=yes [Service] Type=oneshot -ExecStart=/opt/openslx/scripts/shutdown-system_usage_update +ExecStartPre=/opt/openslx/scripts/shutdown-system_usage_update +ExecStart=/bin/true RemainAfterExit=yes 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 76adb3d4..55c9dfa8 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 @@ -361,6 +361,8 @@ if curl --retry 4 --retry-connrefused \ touch "/etc/cron.d" # Sometimes, aufs doesn't update the mtime of dirs when creating files, # so cron would not rescan the cron directory cleanup + # Trigger right now so resource usage gets updated + /opt/openslx/scripts/cron-system_usage_update exit 0 else echo "Failed..." |