[2380] dump progress reports "on the same line", just like the old loadzone

diff --git a/src/bin/loadzone/loadzone.py.in b/src/bin/loadzone/loadzone.py.in
index 0e7909c87b6005bef93c35b45460398c9f7e79d1..12bdd8bf4cc72cbd72de1ae22f4d897ede1a3524 100755 (executable)
--- a/src/bin/loadzone/loadzone.py.in
+++ b/src/bin/loadzone/loadzone.py.in
@@ -17,6 +17,7 @@
 
 import sys
 sys.path.append('@@PYTHONPATH@@')
+import time
 from optparse import OptionParser
 from isc.dns import *
 from isc.datasrc import *
@@ -193,8 +194,10 @@ class LoadZoneRunner:
                         [self._zone_name.to_text()])
 
     def _report_progress(self, loaded_rrs):
-        logger.info(LOADZONE_LOADING, loaded_rrs,
-                    self._zone_name, self._zone_class)
+        elapsed = time.time() - self.__start_time
+        sys.stdout.write("\r" + (80 * " "))
+        sys.stdout.write("\r%d RRs loaded in %.2f seconds" %
+                         (loaded_rrs, elapsed))
 
     def _do_load(self):
         '''Main part of the load logic.
@@ -212,6 +215,7 @@ class LoadZoneRunner:
                             self._zone_class)
             loader = ZoneLoader(datasrc_client, self._zone_name,
                                 self._zone_file)
+            self.__start_time = time.time()
             if self._load_iteration_limit > 0:
                 while not loader.load_incremental(self._load_iteration_limit):
                     self.__loaded_rrs += self._load_iteration_limit

diff --git a/src/bin/loadzone/loadzone_messages.mes b/src/bin/loadzone/loadzone_messages.mes
index ed126a5319333fe5bf583ec5aaa32bf57f8240eb..577e01be61b7f7741a3d3214ec7bcca9d4e8c9a1 100644 (file)
--- a/src/bin/loadzone/loadzone_messages.mes
+++ b/src/bin/loadzone/loadzone_messages.mes
@@ -26,8 +26,6 @@
 
 % LOADZONE_UNEXPECTED_FAILURE Unexpected exception: %1
 
-% LOADZONE_LOADING Loaded %1 RRs into %2/%3, continued
-
 % LOADZONE_DONE Load zone %1/%2 completed
 
 % LOADZONE_POSTLOAD_ISSUE New version of zone %1/%2 has an issue: %3