[svn] commit: r2769 - in /branches/trac191-rebased: ./ src/bin/ src/bin/bind10/ src/bin/stats/ src/bin/stats/tests/
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Aug 20 06:19:11 UTC 2010
Author: naokikambe
Date: Fri Aug 20 06:19:11 2010
New Revision: 2769
Log:
add current source files of stats module (merge from trac191 between r2194 and r2768)
Added:
branches/trac191-rebased/src/bin/stats/Makefile.am
- copied unchanged from r2768, branches/trac191/src/bin/stats/Makefile.am
branches/trac191-rebased/src/bin/stats/b10-stats.8
- copied unchanged from r2768, branches/trac191/src/bin/stats/b10-stats.8
branches/trac191-rebased/src/bin/stats/b10-stats.xml
- copied unchanged from r2768, branches/trac191/src/bin/stats/b10-stats.xml
branches/trac191-rebased/src/bin/stats/run_b10-stats.sh.in
- copied unchanged from r2768, branches/trac191/src/bin/stats/run_b10-stats.sh.in
branches/trac191-rebased/src/bin/stats/run_b10-stats_stub.sh.in
- copied unchanged from r2768, branches/trac191/src/bin/stats/run_b10-stats_stub.sh.in
branches/trac191-rebased/src/bin/stats/stats.py.in
- copied unchanged from r2768, branches/trac191/src/bin/stats/stats.py.in
branches/trac191-rebased/src/bin/stats/stats.spec.pre.in
- copied unchanged from r2768, branches/trac191/src/bin/stats/stats.spec.pre.in
branches/trac191-rebased/src/bin/stats/stats_stub.py.in
- copied unchanged from r2768, branches/trac191/src/bin/stats/stats_stub.py.in
branches/trac191-rebased/src/bin/stats/tests/
- copied from r2768, branches/trac191/src/bin/stats/tests/
Modified:
branches/trac191-rebased/configure.ac
branches/trac191-rebased/src/bin/Makefile.am
branches/trac191-rebased/src/bin/bind10/bind10.py.in
Modified: branches/trac191-rebased/configure.ac
==============================================================================
--- branches/trac191-rebased/configure.ac (original)
+++ branches/trac191-rebased/configure.ac Fri Aug 20 06:19:11 2010
@@ -413,6 +413,8 @@
src/bin/xfrout/tests/Makefile
src/bin/zonemgr/Makefile
src/bin/zonemgr/tests/Makefile
+ src/bin/stats/Makefile
+ src/bin/stats/tests/Makefile
src/bin/usermgr/Makefile
src/lib/Makefile
src/lib/bench/Makefile
@@ -461,6 +463,12 @@
src/bin/zonemgr/zonemgr.spec.pre
src/bin/zonemgr/tests/zonemgr_test
src/bin/zonemgr/run_b10-zonemgr.sh
+ src/bin/stats/stats.py
+ src/bin/stats/stats_stub.py
+ src/bin/stats/stats.spec.pre
+ src/bin/stats/run_b10-stats.sh
+ src/bin/stats/run_b10-stats_stub.sh
+ src/bin/stats/tests/stats_test
src/bin/bind10/bind10.py
src/bin/bind10/tests/bind10_test
src/bin/bind10/run_bind10.sh
@@ -493,6 +501,9 @@
chmod +x src/bin/xfrin/run_b10-xfrin.sh
chmod +x src/bin/xfrout/run_b10-xfrout.sh
chmod +x src/bin/zonemgr/run_b10-zonemgr.sh
+ chmod +x src/bin/stats/tests/stats_test
+ chmod +x src/bin/stats/run_b10-stats.sh
+ chmod +x src/bin/stats/run_b10-stats_stub.sh
chmod +x src/bin/bind10/run_bind10.sh
chmod +x src/bin/cmdctl/tests/cmdctl_test
chmod +x src/bin/xfrin/tests/xfrin_test
Modified: branches/trac191-rebased/src/bin/Makefile.am
==============================================================================
--- branches/trac191-rebased/src/bin/Makefile.am (original)
+++ branches/trac191-rebased/src/bin/Makefile.am Fri Aug 20 06:19:11 2010
@@ -1,1 +1,1 @@
-SUBDIRS = bind10 bindctl cfgmgr loadzone msgq host cmdctl auth xfrin xfrout usermgr zonemgr
+SUBDIRS = bind10 bindctl cfgmgr loadzone msgq host cmdctl auth xfrin xfrout usermgr zonemgr stats
Modified: branches/trac191-rebased/src/bin/bind10/bind10.py.in
==============================================================================
--- branches/trac191-rebased/src/bin/bind10/bind10.py.in (original)
+++ branches/trac191-rebased/src/bin/bind10/bind10.py.in Fri Aug 20 06:19:11 2010
@@ -418,15 +418,14 @@
sys.stdout.write("[bind10] Started b10-zonemgr(PID %d)\n" %
zonemgr.pid)
- # start the b10-cmdctl
- # XXX: we hardcode port 8080
- cmdctl_args = ['b10-cmdctl']
- if self.verbose:
- sys.stdout.write("[bind10] Starting b10-cmdctl on port 8080\n")
- cmdctl_args += ['-v']
- try:
- cmd_ctrld = ProcessInfo("b10-cmdctl", cmdctl_args,
- c_channel_env)
+ # start b10-stats
+ stats_args = ['b10-stats']
+ if self.verbose:
+ sys.stdout.write("[bind10] Starting b10-stats\n")
+ stats_args += ['-v']
+ try:
+ statsd = ProcessInfo("b10-stats", stats_args,
+ c_channel_env)
except Exception as e:
c_channel.process.kill()
bind_cfgd.process.kill()
@@ -434,6 +433,29 @@
auth.process.kill()
xfrind.process.kill()
zonemgr.process.kill()
+ return "Unable to start b10-stats; " + str(e)
+
+ self.processes[statsd.pid] = statsd
+ if self.verbose:
+ sys.stdout.write("[bind10] Started b10-stats (PID %d)\n" % statsd.pid)
+
+ # start the b10-cmdctl
+ # XXX: we hardcode port 8080
+ cmdctl_args = ['b10-cmdctl']
+ if self.verbose:
+ sys.stdout.write("[bind10] Starting b10-cmdctl on port 8080\n")
+ cmdctl_args += ['-v']
+ try:
+ cmd_ctrld = ProcessInfo("b10-cmdctl", cmdctl_args,
+ c_channel_env)
+ except Exception as e:
+ c_channel.process.kill()
+ bind_cfgd.process.kill()
+ xfrout.process.kill()
+ auth.process.kill()
+ xfrind.process.kill()
+ zonemgr.process.kill()
+ statsd.process.kill()
return "Unable to start b10-cmdctl; " + str(e)
self.processes[cmd_ctrld.pid] = cmd_ctrld
if self.verbose:
@@ -453,6 +475,7 @@
self.cc_session.group_sendmsg(cmd, "Boss", "Xfrout")
self.cc_session.group_sendmsg(cmd, "Boss", "Xfrin")
self.cc_session.group_sendmsg(cmd, "Boss", "Zonemgr")
+ self.cc_session.group_sendmsg(cmd, "Boss", "Stats")
def stop_process(self, process):
"""Stop the given process, friendly-like."""
More information about the bind10-changes
mailing list