summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2010-01-06 17:01:50 +0000
committerAlan Conway <aconway@apache.org>2010-01-06 17:01:50 +0000
commite7c824871a7238697e5c534aafffee99078975cd (patch)
tree8fe2f397beb8f3b2e2fe94386dfee7aa168b2376 /python
parentde23cb5942844463a237cff18c30e5f43ea5d5d0 (diff)
downloadqpid-python-e7c824871a7238697e5c534aafffee99078975cd.tar.gz
Added config-seq counter to track config changes since cluster init.
Config-seq is recorded persitently to help identify best store when recovering from total failure. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@896538 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'python')
-rw-r--r--python/qpid/brokertest.py11
1 files changed, 1 insertions, 10 deletions
diff --git a/python/qpid/brokertest.py b/python/qpid/brokertest.py
index f09d1ec15c..9ace762465 100644
--- a/python/qpid/brokertest.py
+++ b/python/qpid/brokertest.py
@@ -248,16 +248,6 @@ class Broker(Popen):
def host_port(self): return "%s:%s" % (self.host, self.port())
- def search_log(self, regex):
- """Search for regular expression in broker log, return match"""
- return regex.search(file(self.log).read())
-
- def get_member_id(self):
- """Search log file for cluster member ID"""
- match = self.search_log(re.compile(r"cluster\(([0-9.:]*) INIT\)"))
- if not match: raise Exception("No cluster member-id found in "+log)
- return match.group(1)
-
def ready(self):
"""Wait till broker is ready to serve clients"""
self.connect().close()
@@ -275,6 +265,7 @@ class Cluster:
# Use unique cluster name
self.args = copy(args)
self.args += [ "--cluster-name", "%s-%s:%d" % (self.name, socket.gethostname(), os.getpid()) ]
+ self.args += [ "--log-enable=info+", "--log-enable=debug+:cluster"]
assert BrokerTest.cluster_lib
self.args += [ "--load-module", BrokerTest.cluster_lib ]
self.start_n(count, expect=expect, wait=wait)