summaryrefslogtreecommitdiff
path: root/src/mongo/util/background.cpp
diff options
context:
space:
mode:
authorAndy Schwerin <schwerin@10gen.com>2013-07-01 14:35:03 -0400
committerAndy Schwerin <schwerin@10gen.com>2013-07-09 16:43:33 -0400
commitea22c3173541606519ddcb6da578b837a092b1c1 (patch)
treed3736e74ee67126f00466eec1686578ba8797749 /src/mongo/util/background.cpp
parent4bab9b0ee8dbffa00c4c86ea20195524a90f81f4 (diff)
downloadmongo-ea22c3173541606519ddcb6da578b837a092b1c1.tar.gz
SERVER-10084 New logging implementation.
This change-set: * Introduces a new top-level directory, mongo/logger, containing most of the implementation of logging functionality formerly found in log.cpp/log.h. * Cleans up existing, unusual uses of the logging system that were not trivially compatible with the new implementation. * Replaces Logstream/Nulstream with a LogstreamBuilder object, whose destructor writes log messages. This new LogstreamBuilder is reentrant, unlike the old logging code, which was thread-safe but not reentrant. Additionally, std::endl is no longer required to terminate a log line. When a LogstreamBuilder goes out of scope, the log message gets committed. * Separates the log system into several components: a global LogManager, several LogDomains, various kinds of Appenders (e.g., SyslogAppender) and Encoders (for formatting messages). * Allows unit tests to capture and examine log output. This patch does _not_ introduce support for hierarchical log domains, or for enabling and disabling specific log domains when the server is running in a multi-threaded mode. This is future work.
Diffstat (limited to 'src/mongo/util/background.cpp')
-rw-r--r--src/mongo/util/background.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mongo/util/background.cpp b/src/mongo/util/background.cpp
index 9c20829669d..347f8b1bdd5 100644
--- a/src/mongo/util/background.cpp
+++ b/src/mongo/util/background.cpp
@@ -24,6 +24,7 @@
#include "mongo/util/concurrency/mutex.h"
#include "mongo/util/concurrency/spin_lock.h"
+#include "mongo/util/concurrency/thread_name.h"
#include "mongo/util/mongoutils/str.h"
#include "mongo/util/net/ssl_manager.h"
#include "mongo/util/time_support.h"
@@ -65,10 +66,10 @@ namespace mongo {
run();
}
catch ( std::exception& e ) {
- LOG( LL_ERROR ) << "backgroundjob " << name() << " exception: " << e.what() << endl;
+ error() << "backgroundjob " << name() << " exception: " << e.what() << endl;
}
catch(...) {
- LOG( LL_ERROR ) << "uncaught exception in BackgroundJob " << name() << endl;
+ error() << "uncaught exception in BackgroundJob " << name() << endl;
}
{