Skip to content

Commit 5a63e37

Browse files
author
Andy Schwerin
committed
Revert "SERVER-6461: Ensure that nullstream instance is constructed before main()."
Also revert "check that logging framework is initialized early to avoid segfault". This reverts commit 3e54e4c, and commit 6f6f992.
1 parent 78f93d7 commit 5a63e37

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

src/mongo/util/log.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ namespace mongo {
6262
return Logstream::get().prolog();
6363
}
6464

65-
Nullstream::Nullstream() {}
66-
Nullstream::~Nullstream() {}
67-
6865
class LoggingManager {
6966
public:
7067
LoggingManager()

src/mongo/util/log.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,10 @@ namespace mongo {
134134

135135
class Nullstream {
136136
public:
137-
Nullstream();
138-
virtual ~Nullstream();
139137
virtual Nullstream& operator<< (Tee* tee) {
140138
return *this;
141139
}
140+
virtual ~Nullstream() {}
142141
virtual Nullstream& operator<<(const char *) {
143142
return *this;
144143
}

0 commit comments

Comments
 (0)