From 4cdac56c3e1351e5b34f060d36fc88d05a80f32f Mon Sep 17 00:00:00 2001
From: Dmitry Sutyagin <dsutyagin@mirantis.com>
Date: Fri, 26 Aug 2016 19:14:53 +0300
Subject: [PATCH] Improve logging, show most sizes in MB

---
 timmy/cli.py   |  4 +++-
 timmy/nodes.py | 24 ++++++++++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/timmy/cli.py b/timmy/cli.py
index de0c5ab..90e3e4c 100755
--- a/timmy/cli.py
+++ b/timmy/cli.py
@@ -200,6 +200,8 @@ def main(argv=None):
     if args.quiet and not args.log_file:
         args.verbose = 0
     loglevel = loglevels[min(len(loglevels)-1, args.verbose)]
+    # always enable debug log if log file specificed
+    loglevel = logging.DEBUG if args.log_file else loglevel
     FORMAT = ('%(asctime)s %(levelname)s: %(module)s: '
               '%(funcName)s(): %(message)s')
     logging.basicConfig(filename=args.log_file,
@@ -301,7 +303,7 @@ def main(argv=None):
             has_logs = False
         else:
             has_logs = True
-            print('Total logs size to collect: %dMB.' % (size / 1000))
+            print('Total logs size to collect: %dMB.' % (size/1024/1024))
             enough_space = pretty_run(args.quiet, 'Checking free space',
                                       nm.is_enough_space)
             if not enough_space:
diff --git a/timmy/nodes.py b/timmy/nodes.py
index 917f3b0..f00f465 100644
--- a/timmy/nodes.py
+++ b/timmy/nodes.py
@@ -401,6 +401,9 @@ class Node(object):
                         else:
                             self.logger.debug('log file "%s" excluded' % f)
                 self.logger.debug('logs: %s' % (item['files']))
+            self.logger.info('node: %s, total logs size: %dMB' %
+                             (self.id,
+                              sum(self.nodes_list().values())/1024/1024))
         return self.logs
 
     def logs_dict(self):
@@ -890,9 +893,9 @@ class NodeManager(object):
             self.nodes[key].logs = result[key]
         for node in self.nodes.values():
             total_size += sum(node.logs_dict().values())
-        self.logger.info('Full log size on nodes(with fuel): %s bytes' %
+        self.logger.info('Full log size on nodes(with fuel): %d bytes' %
                          total_size)
-        self.alogsize = total_size / 1024
+        self.alogsize = total_size
         return self.alogsize
 
     def is_enough_space(self):
@@ -908,15 +911,16 @@ class NodeManager(object):
                               outs)
             return False
         coeff = self.conf['logs_size_coefficient']
-        self.logger.info('logsize: %s Kb * %s, free space: %s Kb' %
-                         (self.alogsize, coeff, fs))
-        if (self.alogsize*coeff > fs):
-            self.logger.error('Not enough space in "%s", logsize: %s Kb * %s, '
-                              'available: %s Kb. Decrease logs_size_coefficien'
-                              't config parameter (--logs-coeff CLI parameter)'
+        self.logger.info('logsize: %dMB * %s, free space: %dMB' %
+                         (self.alogsize/1024/1024, coeff, fs/1024))
+        if (self.alogsize*coeff > fs*1024):
+            self.logger.error('Not enough space in "%s", logsize: %dMB * %s, '
+                              'available: %dMB. Decrease logs_size_coefficient'
+                              ' config parameter (--logs-coeff CLI parameter)'
                               ' or free up space.' % (self.conf['outdir'],
-                                                      self.alogsize, coeff,
-                                                      fs))
+                                                      self.alogsize/1024/1024,
+                                                      coeff,
+                                                      fs/1024))
             return False
         else:
             return True