From 7aa53137624142e666dd444c58994f1a2d387da9 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 19 May 2021 23:57:12 +0200 Subject: syncoid/autosuspend: nicer output of autosuspender --- roles/storage/zfs/syncoid/templates/autosuspend.py.j2 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'roles/storage') diff --git a/roles/storage/zfs/syncoid/templates/autosuspend.py.j2 b/roles/storage/zfs/syncoid/templates/autosuspend.py.j2 index fdeada52..3dd893b2 100644 --- a/roles/storage/zfs/syncoid/templates/autosuspend.py.j2 +++ b/roles/storage/zfs/syncoid/templates/autosuspend.py.j2 @@ -11,7 +11,7 @@ class AutoSuspender(object): def __init__(self): self.__bus = dbus.SystemBus() - self.__timer_re = re.compile('^syncoid-run-.*\.timer$') + self.__timer_re = re.compile('^syncoid-pull-.*\.timer$') # self.__pp = pprint.PrettyPrinter(indent=2) def _get_interface(self, dest, object, interface): @@ -19,7 +19,7 @@ class AutoSuspender(object): obj = self.__bus.get_object(dest, object) return dbus.Interface(obj, interface) except dbus.exceptions.DBusException as error: - print(error) + print("ERR: %s" % error) sys.exit(1) def _get_logind_manager_interface(self): @@ -63,20 +63,20 @@ class AutoSuspender(object): users = self._get_users_logged_in() if(len(users) > 0): - print("%d users logged in: %s" % (len(users), ", ".join([user[0] for user in users]))) + print(" [NO] %d users logged in: %s" % (len(users), ", ".join([user[0] for user in users]))) result = False else: - print("no users logged in.") + print(" [ok] no users logged in.") timers = self._get_syncoid_timers() for timer in timers: next = self._get_timer_next_elapse(timer[1]) until = next - datetime.datetime.now() if(until < datetime.timedelta(minutes=10)): - print("timer '%s' elapses in less then 10 Minutes -> %s (%s)" % (timer[0], next, until)) + print(" [NO] timer '%s' elapses in less then 10 Minutes -> %s (%s)" % (timer[0], next, until)) result = False else: - print("timer '%s' elapses in %s (%s)" % (timer[0], until, next)) + print(" [ok] timer '%s' elapses in %s (%s)" % (timer[0], until, next)) return result @@ -85,14 +85,14 @@ class AutoSuspender(object): if not manager.CanSuspend(): print("suspending is not possible!") return - - print("suspending system") manager.Suspend(False) if __name__ == "__main__": s = AutoSuspender() + print("checking if system should be suspended:") if s.check(): + print("trying to suspend system") s.suspend() else: - print("not suspending system") + print("not suspending system because at least one check failed.") -- cgit v1.2.3