From 9b996157ed9b52a815e137bc8a715c7644f2e738 Mon Sep 17 00:00:00 2001 From: Alexey Avramov Date: Fri, 19 Jul 2019 01:13:24 +0900 Subject: [PATCH] fix alerts --- nohang | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/nohang b/nohang index fbd8e4c..dee76ee 100755 --- a/nohang +++ b/nohang @@ -837,30 +837,41 @@ def check_zram(): +''' def format_time(t): - """ - """ + t = int(t) + if t < 60: + return '{} sec'.format(t) + if t >= 60 and t < 3600: + m = t // 60 + s = t % 60 + return '{} min {} sec'.format(m, s) + h = t // 3600 + s0 = t - h * 3600 + m = s0 // 60 + s = s0 % 60 + return '{} h {} min {} sec'.format(h, m, s) +''' + + +def format_time(t): t = int(t) if t < 60: return '{} sec'.format(t) - elif (t < 3600 and t >= 60): - m = t // 60 - s = t % 60 - return '{} min {} sec'.format(m, s) - - else: + if t > 3600: h = t // 3600 s0 = t - h * 3600 m = s0 // 60 s = s0 % 60 return '{} h {} min {} sec'.format(h, m, s) - - + m = t // 60 + s = t % 60 + return '{} min {} sec'.format(m, s) @@ -1979,7 +1990,8 @@ def implement_corrective_action( try: log(preventing_oom_message) except UnboundLocalError: - preventing_oom_message = key + pass + # preventing_oom_message = key if not vwd: if victim_id not in v_dict: