3 files changed, 58 insertions, 15 deletions

diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index 0af7fd423cf..bd6407bbff8 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -101,6 +101,7 @@ env.Library(
         'util/log.cpp',
         'util/signal_handlers_synchronous.cpp',
         'util/stacktrace_${TARGET_OS_FAMILY}.cpp',
+        'util/stacktrace.cpp',
         'util/static_observer.cpp',
         'util/stringutils.cpp',
         'util/system_tick_source.cpp',
diff --git a/src/mongo/util/stacktrace.cpp b/src/mongo/util/stacktrace.cpp
new file mode 100644
index 00000000000..651f9647a61
--- /dev/null
+++ b/src/mongo/util/stacktrace.cpp
@@ -0,0 +1,52 @@
+/*    Copyright 2015 MongoDB Inc.
+ *
+ *    This program is free software: you can redistribute it and/or  modify
+ *    it under the terms of the GNU Affero General Public License, version 3,
+ *    as published by the Free Software Foundation.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Affero General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Affero General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *    As a special exception, the copyright holders give permission to link the
+ *    code of portions of this program with the OpenSSL library under certain
+ *    conditions as described in each individual source file and distribute
+ *    linked combinations including the program with the OpenSSL library. You
+ *    must comply with the GNU Affero General Public License in all respects
+ *    for all of the code used other than as permitted herein. If you modify
+ *    file(s) with this exception, you may extend this exception to your
+ *    version of the file(s), but you are not obligated to do so. If you do not
+ *    wish to do so, delete this exception statement from your version. If you
+ *    delete this exception statement from all source files in the program,
+ *    then also delete it in the license file.
+ */
+
+// stacktrace_${TARGET_OS_FAMILY}.cpp sets default log component to kControl.
+// Setting kDefault to preserve previous behavior in (defunct) getStacktraceLogger().
+#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kDefault
+
+#include "mongo/platform/basic.h"
+
+#include "mongo/util/stacktrace.h"
+
+#include "mongo/util/log.h"
+
+namespace mongo {
+
+void printStackTrace() {
+    printStackTrace(log().stream());
+}
+
+#if defined(_WIN32)
+
+void printWindowsStackTrace(CONTEXT& context) {
+    printWindowsStackTrace(context, log().stream());
+}
+
+#endif  // defined(_WIN32)
+
+}  // namespace mongo
diff --git a/src/mongo/util/stacktrace.h b/src/mongo/util/stacktrace.h
index dcd543b1cc1..184ea4add4b 100644
--- a/src/mongo/util/stacktrace.h
+++ b/src/mongo/util/stacktrace.h
@@ -31,10 +31,7 @@
 
 #pragma once
 
-#include "mongo/logger/log_severity.h"
-#include "mongo/logger/logger.h"
-#include "mongo/logger/logstream_builder.h"
-#include "mongo/util/concurrency/thread_name.h"
+#include <iosfwd>
 
 #if defined(_WIN32)
 // We need to pick up a decl for CONTEXT. Forward declaring would be preferable, but it is
@@ -44,21 +41,14 @@
 
 namespace mongo {
 
-/**
-  * Returns a log stream builder suitable for printStackTrace() default argument
-  * Do not use in any other context.
-  */
-inline logger::LogstreamBuilder getStackTraceLogger() {
-    using namespace logger;
-    return LogstreamBuilder(globalLogDomain(), getThreadName(), LogSeverity::Log());
-}
-
 // Print stack trace information to "os", default to the log stream.
-void printStackTrace(std::ostream& os = getStackTraceLogger().stream());
+void printStackTrace(std::ostream& os);
+void printStackTrace();
 
 #if defined(_WIN32)
 // Print stack trace (using a specified stack context) to "os", default to the log stream.
-void printWindowsStackTrace(CONTEXT& context, std::ostream& os = getStackTraceLogger().stream());
+void printWindowsStackTrace(CONTEXT& context, std::ostream& os);
+void printWindowsStackTrace(CONTEXT& context);
 
 // Print error message from C runtime followed by stack trace
 int crtDebugCallback(int, char* originalMessage, int*);