diff options
| author | Alan Conway <aconway@apache.org> | 2010-05-06 18:53:29 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-05-06 18:53:29 +0000 |
| commit | fc5b5223c76ea5d9774bec77591c7b190270bea7 (patch) | |
| tree | 1839994460eed30e90ed13eae5ae89a052be3a7e /cpp/src | |
| parent | a2621fc79260bfc6c60fc76bf95940a7939b9df4 (diff) | |
| download | qpid-python-fc5b5223c76ea5d9774bec77591c7b190270bea7.tar.gz | |
Correct brokertest.retry logic.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@941852 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/cluster/Cluster.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/tests/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp index a5581cff5e..c3d83cfcac 100644 --- a/cpp/src/qpid/cluster/Cluster.cpp +++ b/cpp/src/qpid/cluster/Cluster.cpp @@ -965,7 +965,7 @@ void Cluster::memberUpdate(Lock& l) { // Mark store clean if I am the only broker, dirty otherwise. if (size == 1 ) { if (store.getState() != STORE_STATE_CLEAN_STORE) { - QPID_LOG(notice, "Sole member of cluster, marking store clean."); + QPID_LOG(notice, *this << "Sole member of cluster, marking store clean."); store.clean(Uuid(true)); } } diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am index 1faed16173..6133fc2e49 100644 --- a/cpp/src/tests/Makefile.am +++ b/cpp/src/tests/Makefile.am @@ -370,7 +370,7 @@ EXTRA_DIST+= \ check-long: $(MAKE) check TESTS="$(LONG_TESTS)" VALGRIND= -check: python_prep +check: python_prep test_env.sh PYTHON_SRC_DIR=$(abs_srcdir)/../../../python PYTHON_BLD_DIR=$(abs_builddir)/python |