BIND 10 trac2196, updated. 9b21a126b6ec053cad9a04526e8309047c61778e [2196] Added initialization of differential counters
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Jul 22 06:13:15 UTC 2013
The branch, trac2196 has been updated
via 9b21a126b6ec053cad9a04526e8309047c61778e (commit)
from 23f178e37fca797d9ba9830f80a3123faeaec81b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9b21a126b6ec053cad9a04526e8309047c61778e
Author: Kazunori Fujiwara <fujiwara at wide.ad.jp>
Date: Mon Jul 22 15:08:49 2013 +0900
[2196] Added initialization of differential counters
Counters works well and lettuce test passed.
However, unittest is not updated.
-----------------------------------------------------------------------
Summary of changes:
src/bin/stats/stats.py.in | 14 +++++++-------
tests/lettuce/features/queries.feature | 22 +++++++++++-----------
2 files changed, 18 insertions(+), 18 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/stats/stats.py.in b/src/bin/stats/stats.py.in
index 7ab0815..98f9249 100755
--- a/src/bin/stats/stats.py.in
+++ b/src/bin/stats/stats.py.in
@@ -553,14 +553,14 @@ class Stats:
if self.modules[owner].validate_statistics(
False, {_key: _val}, errors):
if owner not in _data:
- _data[owner] = { mid: { _key: _val } }
+ _data[owner] = { mid: statistics_data[owner] }
elif mid not in _data[owner]:
- _data[owner][mid] = { _key: _val }
- else:
- # merge recursively old value and new
- # value each other
- _data[owner][mid] = \
- merge_oldnew(_data[owner][mid], {_key: _val})
+ _data[owner][mid] = statistics_data[owner]
+
+ # merge recursively old value and new
+ # value each other
+ _data[owner][mid] = \
+ merge_oldnew(_data[owner][mid], {_key: _val})
continue
# the key string might be a "xx/yy/zz[0]"
# type. try it.
diff --git a/tests/lettuce/features/queries.feature b/tests/lettuce/features/queries.feature
index 2db6c3e..4b26136 100644
--- a/tests/lettuce/features/queries.feature
+++ b/tests/lettuce/features/queries.feature
@@ -75,7 +75,7 @@ Feature: Querying feature
# make sure Auth module replied to the command
And wait for new bind10 stderr message CC_REPLY
# make sure the response is for 'getstats'
- And wait for new bind10 stderr message v4
+ And wait for new bind10 stderr message _SERVER_
Then I query statistics zones of bind10 module Auth
And last bindctl output should not contain "error"
The statistics counters are 0 in category .Auth.zones._SERVER_
@@ -111,7 +111,7 @@ Feature: Querying feature
# make sure Auth module replied to the command
And wait for new bind10 stderr message CC_REPLY
# make sure the response is for 'getstats'
- And wait for new bind10 stderr message v4
+ And wait for new bind10 stderr message _SERVER_
Then I query statistics zones of bind10 module Auth
And last bindctl output should not contain "error"
The statistics counters are 0 in category .Auth.zones._SERVER_ except for the following items
@@ -157,7 +157,7 @@ Feature: Querying feature
# make sure Auth module replied to the command
And wait for new bind10 stderr message CC_REPLY
# make sure the response is for 'getstats'
- And wait for new bind10 stderr message v4
+ And wait for new bind10 stderr message _SERVER_
Then I query statistics zones of bind10 module Auth
And last bindctl output should not contain "error"
The statistics counters are 0 in category .Auth.zones._SERVER_ except for the following items
@@ -191,7 +191,7 @@ Feature: Querying feature
# make sure Auth module replied to the command
And wait for new bind10 stderr message CC_REPLY
# make sure the response is for 'getstats'
- And wait for new bind10 stderr message v4
+ And wait for new bind10 stderr message _SERVER_
Then I query statistics zones of bind10 module Auth
And last bindctl output should not contain "error"
The statistics counters are 0 in category .Auth.zones._SERVER_ except for the following items
@@ -226,7 +226,7 @@ Feature: Querying feature
# make sure Auth module replied to the command
And wait for new bind10 stderr message CC_REPLY
# make sure the response is for 'getstats'
- And wait for new bind10 stderr message v4
+ And wait for new bind10 stderr message _SERVER_
Then I query statistics zones of bind10 module Auth
And last bindctl output should not contain "error"
The statistics counters are 0 in category .Auth.zones._SERVER_
@@ -260,7 +260,7 @@ Feature: Querying feature
# make sure Auth module replied to the command
And wait for new bind10 stderr message CC_REPLY
# make sure the response is for 'getstats'
- And wait for new bind10 stderr message v4
+ And wait for new bind10 stderr message _SERVER_
Then I query statistics zones of bind10 module Auth
And last bindctl output should not contain "error"
The statistics counters are 0 in category .Auth.zones._SERVER_ except for the following items
@@ -285,7 +285,7 @@ Feature: Querying feature
# make sure Auth module replied to the command
And wait for new bind10 stderr message CC_REPLY
# make sure the response is for 'getstats'
- And wait for new bind10 stderr message v4
+ And wait for new bind10 stderr message _SERVER_
Then I query statistics zones of bind10 module Auth
And last bindctl output should not contain "error"
The statistics counters are 0 in category .Auth.zones._SERVER_
@@ -315,7 +315,7 @@ Feature: Querying feature
# make sure Auth module replied to the command
And wait for new bind10 stderr message CC_REPLY
# make sure the response is for 'getstats'
- And wait for new bind10 stderr message v4
+ And wait for new bind10 stderr message _SERVER_
Then I query statistics zones of bind10 module Auth
And last bindctl output should not contain "error"
The statistics counters are 0 in category .Auth.zones._SERVER_ except for the following items
@@ -352,7 +352,7 @@ Feature: Querying feature
# make sure Auth module replied to the command
And wait for new bind10 stderr message CC_REPLY
# make sure the response is for 'getstats'
- And wait for new bind10 stderr message v4
+ And wait for new bind10 stderr message _SERVER_
Then I query statistics zones of bind10 module Auth
And last bindctl output should not contain "error"
The statistics counters are 0 in category .Auth.zones._SERVER_
@@ -370,7 +370,7 @@ Feature: Querying feature
# make sure Auth module replied to the command
And wait for new bind10 stderr message CC_REPLY
# make sure the response is for 'getstats'
- And wait for new bind10 stderr message v4
+ And wait for new bind10 stderr message _SERVER_
Then I query statistics zones of bind10 module Auth
And last bindctl output should not contain "error"
The statistics counters are 0 in category .Auth.zones._SERVER_ except for the following items
@@ -399,7 +399,7 @@ Feature: Querying feature
# make sure Auth module replied to the command
And wait for new bind10 stderr message CC_REPLY
# make sure the response is for 'getstats'
- And wait for new bind10 stderr message v4
+ And wait for new bind10 stderr message _SERVER_
Then I query statistics zones of bind10 module Auth
And last bindctl output should not contain "error"
The statistics counters are 0 in category .Auth.zones._SERVER_ except for the following items
More information about the bind10-changes
mailing list