From 1a469b992ef2f28d98f43e63cf4d520c1bf830a4 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 23 Jul 2007 13:08:16 +0000 Subject: * src/tests/cluster.mk: Enable cluster test. * src/tests/Cluster.h (class TestHandler): Fixed race in TestHandler::waitFor * src/tests/Cluster.cpp - Allow separate start of parent and child processes. * src/qpid/Options.cpp (parse): Skip argv parsing if argc=0. * src/qpid/cluster/Cluster.cpp (configChange): assert group name. * src/qpid/cluster/Cpg.cpp, .h: Additional logging * src/qpid/framing/AMQFrame.cpp: Initialize all fields in ctor, avoid valgrind warning. * src/qpid/log/Logger.cpp: Initialize singleton automatically from environment so logging can be used on tests. * src/qpid/sys/Time.h: Avoid overflow in AbsTime(t, TIME_INFINITE) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@558710 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/log/Logger.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'cpp/src/qpid/log/Logger.cpp') diff --git a/cpp/src/qpid/log/Logger.cpp b/cpp/src/qpid/log/Logger.cpp index ceb3977106..6e8f3a59cc 100644 --- a/cpp/src/qpid/log/Logger.cpp +++ b/cpp/src/qpid/log/Logger.cpp @@ -85,7 +85,15 @@ Logger& Logger::instance() { return boost::details::pool::singleton_default::instance(); } -Logger::Logger() : flags(0) {} +Logger::Logger() : flags(0) { + // Initialize myself from env variables so all programs + // (e.g. tests) can use logging even if they don't parse + // command line args. + Options opts; + opts.parse(0, 0); + configure(opts,""); +} + Logger::~Logger() {} void Logger::select(const Selector& s) { @@ -190,6 +198,7 @@ void Logger::remove(Statement& s) { void Logger::configure(const Options& opts, const std::string& prog) { + clear(); Options o(opts); if (o.trace) o.selectors.push_back("trace+"); -- cgit v1.2.1