BIND 10 trac547, updated. 7a98a19dd6326424748be5f1f7db8ce8c595c071 [trac547] correct spelling
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Feb 16 08:38:36 UTC 2011
The branch, trac547 has been updated
via 7a98a19dd6326424748be5f1f7db8ce8c595c071 (commit)
via fdd0170dc24f2a0492eafa6442f9aeb06b5c57e9 (commit)
via c2c197b7d37aeed56567feffcad8189490d8642b (commit)
via 2dcf3123c05be4a04669a01db3cfd24677304c8b (commit)
via 51e6eeaa13039adae2c85f8306d236fc32483cc7 (commit)
via 7fb718eac3d6579836fa26cd9cb11e2358dfe730 (commit)
via b559a09551888709bbeff73cdb8d6f223c4083df (commit)
via c60c3e3a3f07fa9d611823125fed125fb959a404 (commit)
via dc95a5bc8674ca4ccc253f9f5e45bd9d64d2bc4e (commit)
via c720564882eef37144efca3c8f4d7a5b4a111a09 (commit)
from 8342dee428a7ad111d726f62cdda2868dc58524c (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 7a98a19dd6326424748be5f1f7db8ce8c595c071
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Wed Feb 16 17:23:11 2011 +0900
[trac547] correct spelling
commit fdd0170dc24f2a0492eafa6442f9aeb06b5c57e9
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Wed Feb 16 16:23:09 2011 +0900
[trac547] assign the shorter process name
commit c2c197b7d37aeed56567feffcad8189490d8642b
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Wed Feb 16 15:36:55 2011 +0900
[trac547] fix syntax of spec file
commit 2dcf3123c05be4a04669a01db3cfd24677304c8b
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Wed Feb 16 15:36:11 2011 +0900
[trac547] fix calling main function
commit 51e6eeaa13039adae2c85f8306d236fc32483cc7
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Wed Feb 16 15:19:20 2011 +0900
[trac547] add assertion of rising 'TypeError'
commit 7fb718eac3d6579836fa26cd9cb11e2358dfe730
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Wed Feb 16 15:15:01 2011 +0900
[trac547] change type of return into string
commit b559a09551888709bbeff73cdb8d6f223c4083df
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Wed Feb 16 14:15:36 2011 +0900
[trac547] - change copyright
- remove __version__
- add DummySocket class
commit c60c3e3a3f07fa9d611823125fed125fb959a404
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Wed Feb 16 14:14:24 2011 +0900
[trac547] remove __version__
commit dc95a5bc8674ca4ccc253f9f5e45bd9d64d2bc4e
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Wed Feb 16 14:13:54 2011 +0900
[trac547] change copyright
commit c720564882eef37144efca3c8f4d7a5b4a111a09
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Wed Feb 16 14:13:04 2011 +0900
[trac547] add get_socket function to ModuleCCSession class
-----------------------------------------------------------------------
Summary of changes:
src/bin/stats/stats_httpd.py.in | 9 +++++----
src/bin/stats/stats_httpd.spec.pre.in | 6 ++----
src/bin/stats/tests/b10-stats-httpd_test.py | 6 ++----
src/bin/stats/tests/isc/cc/session.py | 27 +++++++++++++++++++--------
src/bin/stats/tests/isc/config/ccsession.py | 8 +++++---
5 files changed, 33 insertions(+), 23 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/stats/stats_httpd.py.in b/src/bin/stats/stats_httpd.py.in
index 33c44e4..92dfd48 100644
--- a/src/bin/stats/stats_httpd.py.in
+++ b/src/bin/stats/stats_httpd.py.in
@@ -37,8 +37,8 @@ else:
SPECFILE_LOCATION = "@datadir@/@PACKAGE@/stats_httpd.spec".replace(
"${datarootdir}", DATAROOTDIR).replace("${prefix}", PREFIX)
-# Assign this process some longer name
-isc.util.process.rename(sys.argv[0])
+# Assign this process name
+isc.util.process.rename()
class Main():
"""
@@ -71,7 +71,7 @@ class Main():
if command == "shutdown":
self.runnable = False
if self.options.verbose:
- sys.stdout.write("[b10-stats-httpd] shutiing down\n")
+ sys.stdout.write("[b10-stats-httpd] shutting down\n")
return isc.config.ccsession.create_answer(0)
else:
return isc.config.ccsession.create_answer(1, "Unknown command: " + str(command))
@@ -101,7 +101,8 @@ class Main():
if __name__ == "__main__":
try:
- Main.main()
+ m = Main()
+ m.main()
except isc.cc.session.SessionError as se:
sys.stderr.write("[b10-stats-httpd] Error creating module, "
+ "is the command channel daemon running?\n")
diff --git a/src/bin/stats/stats_httpd.spec.pre.in b/src/bin/stats/stats_httpd.spec.pre.in
index 7f27d74..ecfa54d 100644
--- a/src/bin/stats/stats_httpd.spec.pre.in
+++ b/src/bin/stats/stats_httpd.spec.pre.in
@@ -2,10 +2,8 @@
"module_spec": {
"module_name": "StatsHttpd",
"module_description": "Stats HTTP daemon",
- "config_data": [
- {}
- ],
+ "config_data": [],
"commands": [
]
}
-}
\ No newline at end of file
+}
diff --git a/src/bin/stats/tests/b10-stats-httpd_test.py b/src/bin/stats/tests/b10-stats-httpd_test.py
index 971a0b9..1b6d02b 100644
--- a/src/bin/stats/tests/b10-stats-httpd_test.py
+++ b/src/bin/stats/tests/b10-stats-httpd_test.py
@@ -41,10 +41,8 @@ class TestStats(unittest.TestCase):
1, "Unknown command: unknown_command"))
self.assertFalse(self.m.runnable)
- #def tests_main(self):
- # self.assertRaises(
- # isc.cc.session.SessionError,
- # self.m.main())
+ def tests_main(self):
+ self.assertRaises(TypeError, self.m.main)
if __name__ == "__main__":
unittest.main()
diff --git a/src/bin/stats/tests/isc/cc/session.py b/src/bin/stats/tests/isc/cc/session.py
index 4d12adc..a07caf7 100644
--- a/src/bin/stats/tests/isc/cc/session.py
+++ b/src/bin/stats/tests/isc/cc/session.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2010 Internet Systems Consortium.
+# Copyright (C) 2010,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
@@ -15,13 +15,24 @@
# This module is a mock-up class of isc.cc.session
-__version__ = "$Revision$"
-
import sys
# set a dummy lname
_TEST_LNAME = '123abc at xxxx'
+class DummySocket:
+ """
+ Dummy Socket Class
+ """
+ def __init__(self):
+ self.closed = False
+
+ def close(self):
+ self.closed = True
+
+ def fileno(self):
+ return 'dummy'
+
class Queue():
def __init__(self, msg=None, env={}):
self.msg = msg
@@ -38,7 +49,7 @@ class Session:
self._lname = _TEST_LNAME
self.message_queue = []
self.old_message_queue = []
- self._socket = True
+ self._socket = DummySocket()
self.verbose = verbose
@property
@@ -46,7 +57,7 @@ class Session:
return self._lname
def close(self):
- self._socket = False
+ self._socket = None
def _next_sequence(self, que=None):
return len(self.message_queue)
@@ -63,7 +74,7 @@ class Session:
return seq
def dequeue(self, seq=0):
- if not self._socket:
+ if self._socket is None:
raise SessionError("Session has been closed.")
que = None
try:
@@ -76,7 +87,7 @@ class Session:
return que
def get_queue(self, seq=None):
- if not self._socket:
+ if self._socket is None:
raise SessionError("Session has been closed.")
if seq is None:
seq = len(self.message_queue) - 1
@@ -112,7 +123,7 @@ class Session:
"reply": routing["seq"] })
def get_message(self, group, to='*'):
- if not self._socket:
+ if self._socket is None:
raise SessionError("Session has been closed.")
que = Queue()
for q in self.message_queue:
diff --git a/src/bin/stats/tests/isc/config/ccsession.py b/src/bin/stats/tests/isc/config/ccsession.py
index fc285a7..93824c7 100644
--- a/src/bin/stats/tests/isc/config/ccsession.py
+++ b/src/bin/stats/tests/isc/config/ccsession.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2010 Internet Systems Consortium.
+# Copyright (C) 2010,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
@@ -15,8 +15,6 @@
# This module is a mock-up class of isc.cc.session
-__version__ = "$Revision$"
-
import json
from isc.cc.session import Session
@@ -111,3 +109,7 @@ class ModuleCCSession(ConfigData):
def get_module_spec(self):
return self.specification
+
+ def get_socket(self):
+ return self._session._socket
+
More information about the bind10-changes
mailing list