BIND 10 trac930, updated. 2006e510e14071414b9f346201d8b60d112cc590 [trac930] modify logging add loggings and new messages for logging remove unused messages from the message file add test logging names into unittest scripts
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Jul 29 13:00:46 UTC 2011
The branch, trac930 has been updated
discards 814c513dcee8573b50b58104e9378b3be6899c5e (commit)
discards b7a511e6d3067c9b364c337d34b600f88a02d7be (commit)
discards 2166335cf053d66fb5ddae5e3831875ae2eb93ce (commit)
discards e1bb6e7a24e10f167c77583a46d5ff69a8a8777b (commit)
discards afc497e50cef8491e5df06f5ae3bcd4ec0cbb1a3 (commit)
discards ba8b24921d6a813615f6cf0184112ca31916127d (commit)
discards 4b9e480b8b852b1de510ca55f2d4aaf85edf2997 (commit)
discards 342c6d3196615eead730b28dc29d60c1ed2fa289 (commit)
discards 2a590471ababf85a3224c15fbfefc3df367334f4 (commit)
discards 8031011c902527ed5f73cfbd066e19dfe2c0a1db (commit)
discards f7a630fe15c7c9e193e65a79c13d7d4f24e87484 (commit)
discards 317427198b32c90ff057de1a162067d7e8984d3e (commit)
discards 988a88cda859715891a203709f1e6425a8136fed (commit)
discards 7130c6a57b2ccf53751429719fed8fd3e3b2870e (commit)
discards 97214530635410145c5ab0f88c6b166a43495396 (commit)
discards 666510e6bb271b75678bfd9984d3464c824ee30e (commit)
discards c45edfb008c469c4234001572d18a149fcce69c1 (commit)
discards a250d2983c22c95d35c6d590604fd90bc2cb6cae (commit)
discards dcfe44bed29cbdd89ad0270e6943e9f3750e5e58 (commit)
discards 76ea743e56c22b9d908c94b00475a6d125d16081 (commit)
discards cf1c190604787f09d05cd8029e2d8adf39037f28 (commit)
discards 9e88485e93f9cd658c38260be19e4d75a9cbb5c8 (commit)
discards 47a780b4d8b0a336e9577bb5c3c7f72e857c0c07 (commit)
discards 577b41637587181548cfcb15bc37b08e65104ed4 (commit)
discards 95befd170766523482994d63ab4cbcce5278a846 (commit)
discards 5d7af1d7207f3380715b3154d3e14710cb2f0a9c (commit)
discards 99e543b87b6b537877498f8dd880becad3a89a0c (commit)
discards adbcfd5da5e1e8de74acfc6eb434382768b31fbd (commit)
discards a6f6fcded4d9ac701865334e7087a61303fed156 (commit)
via 2006e510e14071414b9f346201d8b60d112cc590 (commit)
via 57f502afe22f9490c3d44e2dad86b99862fdd42d (commit)
via 3e0ee86b959b46d1650ddacd13a9786cecd7fc81 (commit)
via 39554710ed442bdb148dad7d40c3e68224d21c59 (commit)
via 06d510b5638caa2a17566fc2b127b8be9eef8a35 (commit)
via e97ea7e8c2b5345dc4d0a515b3f0eef99fe11748 (commit)
via 4dd262e2e1ff71add8959d7d72490079f5f221d5 (commit)
via d0a3781cbaa4789c5d5974bedcf83d3fef020d4a (commit)
via 3a44fe9d65457e8db79f3344dd58388de362741c (commit)
via 8b68bed179a7de9538b3907ea57d86411d2149d1 (commit)
via 2954f6597641581371e1663432ab42b345bb98b2 (commit)
via 3b454a323e9e73feeadeb02c7f4c65bf3b7e5233 (commit)
via e2754b842396fda6240d3f55d10ed3bd036c6e63 (commit)
via 354b879de9a5a313b5724a8297d10e9c557c3550 (commit)
via a0a022bf4c5150f62b8a4118e5d6a4dcaf69f669 (commit)
via 5909fb3d1dd3cd806e0df965d707b45803d4b9c3 (commit)
via 48101b23e5bd1f22dbc560321d604db9f7f970ac (commit)
via a1afeaf8fd99c5ee01049bf2a6744426348cfacc (commit)
via 42eefd78472128b3e16fabdcdc388c90e5bade3c (commit)
via d4801ec0cdc64f02da065d261f918da351837c15 (commit)
via 54767b8a827f258d25b6abf1fef8a312b5239833 (commit)
via a92f3ebf3395919af2b3ecfafd541596625e86be (commit)
via 341ee766ebc3500b5df4465259bf3b2fe97878de (commit)
via a7d90d660a5d8a4f18bbbaf63a545f27952bfa63 (commit)
via b219866684cb8bcdb4239434902fdead527f5006 (commit)
via 474263c95a348fbbf79c79bb4ec0e49eb15874d7 (commit)
via 052b659aeb715d4b11fd7be20b773c47969cde17 (commit)
via c9e15e5386cf73cbe38566ee9d53d77da32ceb34 (commit)
via 6298f33f3247ad0333833fa881ef8f73b7195566 (commit)
via 847df8f9c0ccd43f296e79df6ecd92d77e3da32a (commit)
via c290f8bb897e45d304b2895c394a421f46a2ee68 (commit)
via e54237acf184e5dc6d03409869b525152a259f2a (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (814c513dcee8573b50b58104e9378b3be6899c5e)
\
N -- N -- N (2006e510e14071414b9f346201d8b60d112cc590)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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 2006e510e14071414b9f346201d8b60d112cc590
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Thu Jul 28 22:07:15 2011 +0900
[trac930] modify logging
add loggings and new messages for logging
remove unused messages from the message file
add test logging names into unittest scripts
commit 57f502afe22f9490c3d44e2dad86b99862fdd42d
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Wed Jul 27 20:45:18 2011 +0900
[trac930] modify the update_modues function
There is no part of statistics category in the spec file of a module which has
no statistics data.
commit 3e0ee86b959b46d1650ddacd13a9786cecd7fc81
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Wed Jul 27 16:49:21 2011 +0900
[trac930]
- correct error messages in bindctl
it prints together with arguments.
- modify the command_show function
it reports statistics data of the module even if name is not specified.
- add/modify unittests depending on the changes of error messages
commit 39554710ed442bdb148dad7d40c3e68224d21c59
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Wed Jul 27 16:42:54 2011 +0900
[trac930] remove unnecessary a white space
commit 06d510b5638caa2a17566fc2b127b8be9eef8a35
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Wed Jul 27 10:18:07 2011 +0900
[trac930] add a test pattern which the set command with a non-existent item
name is sent
commit e97ea7e8c2b5345dc4d0a515b3f0eef99fe11748
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Wed Jul 27 10:14:57 2011 +0900
[trac930] modify parse_spec function
returns empty dict if list-type is not specified in the argument
commit 4dd262e2e1ff71add8959d7d72490079f5f221d5
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Jul 22 21:40:07 2011 +0900
[trac930] fix conflicts with trac1021
commit d0a3781cbaa4789c5d5974bedcf83d3fef020d4a
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Jul 22 18:50:41 2011 +0900
[trac930] add changes because query counter names described in the specfile are changed.
commit 3a44fe9d65457e8db79f3344dd58388de362741c
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Jul 22 18:45:19 2011 +0900
[trac930] add the logging when the validation of statistics data fails
commit 8b68bed179a7de9538b3907ea57d86411d2149d1
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Jul 22 18:43:26 2011 +0900
[trac930] Add unittests to test sumitStatistics with the validation of statistics data and add mock ModuleSpec class
commit 2954f6597641581371e1663432ab42b345bb98b2
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Jul 22 18:41:34 2011 +0900
[trac930] Add prototypes of validator_typea and registerStatisticsValidator
- validator_type -- a type of statistics validation function
- registerStatisticsValidator -- the function to register the validation function
commit 3b454a323e9e73feeadeb02c7f4c65bf3b7e5233
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Jul 22 18:37:22 2011 +0900
[trac930]
- Add implementation to validate statistics data
-- When validation is success, it sends data to statistics module. But when it fails, it doesn't send and logs the message.
- Add the function to register the validation function into the class
commit e2754b842396fda6240d3f55d10ed3bd036c6e63
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Jul 22 18:32:22 2011 +0900
[trac930] add the helper functions which are used around the registration of the function to validate the statistics data.
commit 354b879de9a5a313b5724a8297d10e9c557c3550
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Jul 22 18:28:40 2011 +0900
[trac930] add new messages into the message file of Auth and Boss
when validation of statistics data to send to statistics module is failed.
commit a0a022bf4c5150f62b8a4118e5d6a4dcaf69f669
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Wed Jul 20 10:00:29 2011 +0900
[trac930] add statistics validation for bob
commit 5909fb3d1dd3cd806e0df965d707b45803d4b9c3
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Wed Jul 13 20:25:54 2011 +0900
[trac930]
- increase seconds in sleep time which is before HTTP client connects to the server
- delete 'test_log_message' because of the deletion of original function
commit 48101b23e5bd1f22dbc560321d604db9f7f970ac
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Jul 8 21:22:34 2011 +0900
[trac930] remove unneeded empty TODO comments
commit a1afeaf8fd99c5ee01049bf2a6744426348cfacc
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Jul 8 21:09:41 2011 +0900
[trac930] add new entry for #928-#930
commit 42eefd78472128b3e16fabdcdc388c90e5bade3c
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Jul 8 20:08:22 2011 +0900
[trac930] refurbish the unittests for new stats module, new stats httpd module
and new mockups and utilities in test_utils.py
commit d4801ec0cdc64f02da065d261f918da351837c15
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Jul 8 19:56:24 2011 +0900
[trac930] modify Stats
- remove unneeded subject and listener classes
- add StatsError for handling errors in Stats
- add some new methods (update_modules, update_statistics_data and
get_statistics_data)
- modify implementations of existent commands(show and set) according changes
stats.spec
- remove reset and remove command because stats module couldn't manage other
modules' statistics data schema
- add implementation of strict validation of each statistics data
(If the validation is failed, it puts out the error.)
- stats module shows its PID when status command invoked
- add new command showschema invokable via bindctl
- set command requires arguments of owner module name and statistics item name
- show and showschema commands accepts arguments of owner module name and
statistics item name
- exits at exit code 1 if got runtime errors
- has boot time in _BASETIME
commit 54767b8a827f258d25b6abf1fef8a312b5239833
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Jul 8 19:40:15 2011 +0900
[trac930]
- remove "stats-schema.spec" setting and getting statistics data schema via
this spec file
- add "version" item in DEFAULT_CONFIG
- get the address family by socket.getaddrinfo function with specified
server_address in advance, and create HttpServer object once, in stead of
creating double HttpServer objects for IPv6 and IPv4 in the prior code
(It is aimed for avoiding to fail to close the once opened sockets.)
- open HTTP port in start method
- avoid calling config_handler recursively in the except statement
- create XML, XSD, XSL documents after getting statistics data and schema from
remote stats module via CC session
- definitely close once opened template file object
commit a92f3ebf3395919af2b3ecfafd541596625e86be
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Jul 8 16:33:59 2011 +0900
[trac930] update spec file of stats module
- update description of status command, shutdown command and show command
- change argument of show command (Owner module name of statistics data can be
specified)
- change argument of set command (Owner module name of statistics data is
always required)
- add showschema command which shows statistics data schema of each module
specified)
- disabled reset command and remove command
commit 341ee766ebc3500b5df4465259bf3b2fe97878de
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Jul 8 16:21:49 2011 +0900
[trac930] update argument name and argument format of set command in auth module and boss module
and also update related unittests of their modules
commit a7d90d660a5d8a4f18bbbaf63a545f27952bfa63
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Jul 8 16:18:38 2011 +0900
[trac930] remove description about removing statistics data by stats module
update example format in bindctl when show command of stats module is invoked
commit b219866684cb8bcdb4239434902fdead527f5006
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Jul 8 16:13:17 2011 +0900
[trac930] add a column "Owner" in the table tag
commit 474263c95a348fbbf79c79bb4ec0e49eb15874d7
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Jul 8 16:12:09 2011 +0900
[trac930] remove descriptions about "stats-schema.spec" and add description about new
features because stats module can be requested to show statistics data schema.
commit 052b659aeb715d4b11fd7be20b773c47969cde17
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Jul 8 16:00:30 2011 +0900
[trac930] add utilities and mock-up modules for unittests of
statistics modules and change some environ variables (PYTHONPATH,
CONFIG_TESTDATA_PATH) in Makefile
test_utilies.py internally calls msgq, cfgmgr and some mock modules
with threads for as real situation as possible.
commit c9e15e5386cf73cbe38566ee9d53d77da32ceb34
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Jul 8 15:57:41 2011 +0900
[trac930] remove unneeded mockups, fake modules and dummy data
commit 6298f33f3247ad0333833fa881ef8f73b7195566
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Jul 8 15:55:55 2011 +0900
[trac930] remove unneeded specfile "stats-schema.spec"
-----------------------------------------------------------------------
Summary of changes:
src/bin/stats/tests/isc/Makefile.am | 8 ------
src/bin/stats/tests/isc/log/Makefile.am | 7 -----
src/bin/stats/tests/isc/log/__init__.py | 33 --------------------------
src/bin/stats/tests/testdata/stats_test.spec | 19 ---------------
src/lib/python/isc/config/module_spec.py | 24 +++++++++---------
5 files changed, 12 insertions(+), 79 deletions(-)
delete mode 100644 src/bin/stats/tests/isc/Makefile.am
delete mode 100644 src/bin/stats/tests/isc/log/Makefile.am
delete mode 100644 src/bin/stats/tests/isc/log/__init__.py
delete mode 100644 src/bin/stats/tests/testdata/stats_test.spec
-----------------------------------------------------------------------
diff --git a/src/bin/stats/tests/isc/Makefile.am b/src/bin/stats/tests/isc/Makefile.am
deleted file mode 100644
index d31395d..0000000
--- a/src/bin/stats/tests/isc/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-SUBDIRS = cc config util log
-EXTRA_DIST = __init__.py
-CLEANFILES = __init__.pyc
-
-CLEANDIRS = __pycache__
-
-clean-local:
- rm -rf $(CLEANDIRS)
diff --git a/src/bin/stats/tests/isc/log/Makefile.am b/src/bin/stats/tests/isc/log/Makefile.am
deleted file mode 100644
index 457b9de..0000000
--- a/src/bin/stats/tests/isc/log/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-EXTRA_DIST = __init__.py
-CLEANFILES = __init__.pyc
-
-CLEANDIRS = __pycache__
-
-clean-local:
- rm -rf $(CLEANDIRS)
diff --git a/src/bin/stats/tests/isc/log/__init__.py b/src/bin/stats/tests/isc/log/__init__.py
deleted file mode 100644
index 641cf79..0000000
--- a/src/bin/stats/tests/isc/log/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) 2011 Internet Systems Consortium.
-#
-# Permission to use, copy, modify, and distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SYSTEMS CONSORTIUM
-# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
-# INTERNET SYSTEMS CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-# This file is not installed. The log.so is installed into the right place.
-# It is only to find it in the .libs directory when we run as a test or
-# from the build directory.
-# But as nobody gives us the builddir explicitly (and we can't use generation
-# from .in file, as it would put us into the builddir and we wouldn't be found)
-# we guess from current directory. Any idea for something better? This should
-# be enough for the tests, but would it work for B10_FROM_SOURCE as well?
-# Should we look there? Or define something in bind10_config?
-
-import os
-import sys
-
-for base in sys.path[:]:
- loglibdir = os.path.join(base, 'isc/log/.libs')
- if os.path.exists(loglibdir):
- sys.path.insert(0, loglibdir)
-
-from log import *
diff --git a/src/bin/stats/tests/testdata/stats_test.spec b/src/bin/stats/tests/testdata/stats_test.spec
deleted file mode 100644
index 8136756..0000000
--- a/src/bin/stats/tests/testdata/stats_test.spec
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "module_spec": {
- "module_name": "Stats",
- "module_description": "Stats daemon",
- "config_data": [],
- "commands": [
- {
- "command_name": "status",
- "command_description": "identify whether stats module is alive or not",
- "command_args": []
- },
- {
- "command_name": "the_dummy",
- "command_description": "this is for testing",
- "command_args": []
- }
- ]
- }
-}
diff --git a/src/lib/python/isc/config/module_spec.py b/src/lib/python/isc/config/module_spec.py
index 1d51f98..f9ec8b7 100644
--- a/src/lib/python/isc/config/module_spec.py
+++ b/src/lib/python/isc/config/module_spec.py
@@ -92,7 +92,7 @@ class ModuleSpec:
return _validate_spec_list(data_def, full, data, errors)
else:
# no spec, always bad
- if errors != None:
+ if errors is not None:
errors.append("No config_data specification")
return False
@@ -130,11 +130,11 @@ class ModuleSpec:
non-default values). Also it checks 'item_format' in case
of time"""
stat_spec = self.get_statistics_spec()
- if stat_spec != None:
+ if stat_spec is not None:
return _validate_spec_list(stat_spec, full, stat, errors)
else:
# no spec, always bad
- if errors != None:
+ if errors is not None:
errors.append("No statistics specification")
return False
@@ -341,27 +341,27 @@ def _validate_type(spec, value, errors):
specification"""
data_type = spec['item_type']
if data_type == "integer" and type(value) != int:
- if errors != None:
+ if errors is not None:
errors.append(str(value) + " should be an integer")
return False
elif data_type == "real" and type(value) != float:
- if errors != None:
+ if errors is not None:
errors.append(str(value) + " should be a real")
return False
elif data_type == "boolean" and type(value) != bool:
- if errors != None:
+ if errors is not None:
errors.append(str(value) + " should be a boolean")
return False
elif data_type == "string" and type(value) != str:
- if errors != None:
+ if errors is not None:
errors.append(str(value) + " should be a string")
return False
elif data_type == "list" and type(value) != list:
- if errors != None:
+ if errors is not None:
errors.append(str(value) + " should be a list")
return False
elif data_type == "map" and type(value) != dict:
- if errors != None:
+ if errors is not None:
errors.append(str(value) + " should be a map")
return False
else:
@@ -373,7 +373,7 @@ def _validate_format(spec, value, errors):
if "item_format" in spec:
item_format = spec['item_format']
if not _check_format(value, item_format):
- if errors != None:
+ if errors is not None:
errors.append("format type of " + str(value)
+ " should be " + item_format)
return False
@@ -408,7 +408,7 @@ def _validate_spec(spec, full, data, errors):
elif item_name in data:
return _validate_item(spec, full, data[item_name], errors)
elif full and not item_optional:
- if errors != None:
+ if errors is not None:
errors.append("non-optional item " + item_name + " missing")
return False
else:
@@ -433,7 +433,7 @@ def _validate_spec_list(module_spec, full, data, errors):
if spec_item["item_name"] == item_name:
found = True
if not found and item_name != "version":
- if errors != None:
+ if errors is not None:
errors.append("unknown item " + item_name)
validated = False
return validated
More information about the bind10-changes
mailing list