Browse Source

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

JINMEI Tatuya 12 years ago
parent
commit
0f4a4a3b12
2 changed files with 6 additions and 4 deletions
  1. 6 2
      src/bin/loadzone/loadzone.py.in
  2. 0 2
      src/bin/loadzone/loadzone_messages.mes

+ 6 - 2
src/bin/loadzone/loadzone.py.in

@@ -17,6 +17,7 @@
 
 
 import sys
 import sys
 sys.path.append('@@PYTHONPATH@@')
 sys.path.append('@@PYTHONPATH@@')
+import time
 from optparse import OptionParser
 from optparse import OptionParser
 from isc.dns import *
 from isc.dns import *
 from isc.datasrc import *
 from isc.datasrc import *
@@ -193,8 +194,10 @@ class LoadZoneRunner:
                         [self._zone_name.to_text()])
                         [self._zone_name.to_text()])
 
 
     def _report_progress(self, loaded_rrs):
     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):
     def _do_load(self):
         '''Main part of the load logic.
         '''Main part of the load logic.
@@ -212,6 +215,7 @@ class LoadZoneRunner:
                             self._zone_class)
                             self._zone_class)
             loader = ZoneLoader(datasrc_client, self._zone_name,
             loader = ZoneLoader(datasrc_client, self._zone_name,
                                 self._zone_file)
                                 self._zone_file)
+            self.__start_time = time.time()
             if self._load_iteration_limit > 0:
             if self._load_iteration_limit > 0:
                 while not loader.load_incremental(self._load_iteration_limit):
                 while not loader.load_incremental(self._load_iteration_limit):
                     self.__loaded_rrs += self._load_iteration_limit
                     self.__loaded_rrs += self._load_iteration_limit

+ 0 - 2
src/bin/loadzone/loadzone_messages.mes

@@ -26,8 +26,6 @@
 
 
 % LOADZONE_UNEXPECTED_FAILURE Unexpected exception: %1
 % LOADZONE_UNEXPECTED_FAILURE Unexpected exception: %1
 
 
-% LOADZONE_LOADING Loaded %1 RRs into %2/%3, continued
-
 % LOADZONE_DONE Load zone %1/%2 completed
 % LOADZONE_DONE Load zone %1/%2 completed
 
 
 % LOADZONE_POSTLOAD_ISSUE New version of zone %1/%2 has an issue: %3
 % LOADZONE_POSTLOAD_ISSUE New version of zone %1/%2 has an issue: %3