Browse Source

[2883] spec_file_name argument of Counters class is reqiured

Naoki Kambe 11 years ago
parent
commit
0271260016

+ 4 - 5
src/lib/python/isc/statistics/counters.py

@@ -165,14 +165,13 @@ class Counters():
     timers can be temporarily disabled.  If disabled, counter values are
     timers can be temporarily disabled.  If disabled, counter values are
     not changed even if methods to update them are invoked."""
     not changed even if methods to update them are invoked."""
 
 
-    def __init__(self, spec_file_name=None):
+    def __init__(self, spec_file_name):
         """A constructor for the Counters class. A path to the spec file
         """A constructor for the Counters class. A path to the spec file
-        can be specified in spec_file_name. Statistics data based on
-        statistics spec can be accumulated if spec_file_name is
+        can be specified in spec_file_name, which is required. Statistics data
+        based on statistics spec can be accumulated if spec_file_name is
         specified. If omitted, a default statistics spec is used. The
         specified. If omitted, a default statistics spec is used. The
         default statistics spec is defined in a hidden class named
         default statistics spec is defined in a hidden class named
-        _Statistics(). But the hidden class won't be used and
-        spec_file_name will be required in the future release.
+        _Statistics().
         """
         """
         self._zones_item_list = []
         self._zones_item_list = []
         self._start_time = {}
         self._start_time = {}

+ 1 - 1
src/lib/python/isc/statistics/dns.py

@@ -120,7 +120,7 @@ class Counters(counters.Counters):
     # zone names are contained under this dirname in the spec file.
     # zone names are contained under this dirname in the spec file.
     _perzone_prefix = 'zones'
     _perzone_prefix = 'zones'
 
 
-    def __init__(self, spec_file_name=None):
+    def __init__(self, spec_file_name):
         """If the item `zones` is defined in the spec file, it obtains a
         """If the item `zones` is defined in the spec file, it obtains a
         list of counter names under it when initiating.  For behaviors
         list of counter names under it when initiating.  For behaviors
         other than this, see documentation for
         other than this, see documentation for