From 2c5f2bee2ab332a7826a4ded661a3181313f9c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= Date: Tue, 12 Jun 2018 10:21:24 +0200 Subject: [PATCH 1/2] admin: Refactor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ondřej Lysoněk --- tuned/admin/admin.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tuned/admin/admin.py b/tuned/admin/admin.py index 5dffb6c..475ae17 100644 --- a/tuned/admin/admin.py +++ b/tuned/admin/admin.py @@ -30,8 +30,6 @@ class Admin(object): self._controller = None self._log_token = None self._log_level = log_level - # 25 seconds default DBus timeout + 5 seconds safety margin - self._log_capture_timeout = self._timeout + 25 + 5 if self._dbus: self._controller = tuned.admin.DBusController(consts.DBUS_BUS, consts.DBUS_INTERFACE, consts.DBUS_OBJECT, debug) try: @@ -247,9 +245,10 @@ class Admin(object): return self._controller.exit(False) self._daemon_action_finished.clear() if not self._async and self._log_level is not None: + # 25 seconds default DBus timeout + 5 secs safety margin + timeout = self._timeout + 25 + 5 self._log_token = self._controller.log_capture_start( - self._log_level, - self._log_capture_timeout) + self._log_level, timeout) (ret, msg) = self._controller.switch_profile(profile_name) if self._async or not ret: return self._controller.exit(self._profile_print_status(ret, msg)) @@ -292,9 +291,10 @@ class Admin(object): profile_name = self._controller.recommend_profile() self._daemon_action_finished.clear() if not self._async and self._log_level is not None: + # 25 seconds default DBus timeout + 5 secs safety margin + timeout = self._timeout + 25 + 5 self._log_token = self._controller.log_capture_start( - self._log_level, - self._log_capture_timeout) + self._log_level, timeout) (ret, msg) = self._controller.auto_profile() if self._async or not ret: return self._controller.exit(self._profile_print_status(ret, msg)) From 5755b24d296825cb30fe2d31c593ddbb3d35e1f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= Date: Tue, 12 Jun 2018 10:22:50 +0200 Subject: [PATCH 2/2] tuned-adm: Print log excerpt when disabling tuning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Print messages logged while 'tuned-adm off' is executing to stderr. Resolves: rhbz#1538745 Signed-off-by: Ondřej Lysoněk --- tuned/admin/admin.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tuned/admin/admin.py b/tuned/admin/admin.py index 475ae17..728af32 100644 --- a/tuned/admin/admin.py +++ b/tuned/admin/admin.py @@ -337,6 +337,10 @@ class Admin(object): return False def _action_dbus_off(self): + # 25 seconds default DBus timeout + 5 secs safety margin + timeout = 25 + 5 + self._log_token = self._controller.log_capture_start( + self._log_level, timeout) ret = self._controller.off() if not ret: self._error("Cannot disable active profile.")