Skip to content

Commit 0b190a5

Browse files
committed
SERVER-14950 Move rsLog to its own library
1 parent fe11098 commit 0b190a5

25 files changed

+124
-19
lines changed

src/mongo/SConscript

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -926,6 +926,7 @@ serveronlyLibdeps = ["coreshard",
926926
"db/repl/topology_coordinator_impl",
927927
"db/repl/repl_coordinator_global",
928928
"db/repl/replication_executor",
929+
"db/repl/rslog",
929930
'db/storage/mmap_v1/storage_mmapv1',
930931
'db/storage/heap1/storage_heap1',
931932
'$BUILD_DIR/third_party/shim_snappy']

src/mongo/db/repl/SConscript

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ env.Library('repl_settings',
99
'$BUILD_DIR/mongo/server_parameters'
1010
])
1111

12+
env.Library('rslog',
13+
'rslog.cpp',
14+
LIBDEPS=[
15+
'$BUILD_DIR/mongo/logger/logger',
16+
])
17+
1218
env.Library(
1319
'network_interface_impl',
1420
'network_interface_impl.cpp',
@@ -31,7 +37,8 @@ env.Library('topology_coordinator_impl',
3137
['topology_coordinator_impl.cpp',
3238
'member_heartbeat_data.cpp'],
3339
LIBDEPS=['replication_executor',
34-
'repl_settings'])
40+
'repl_settings',
41+
'rslog'])
3542

3643
env.CppUnitTest('topology_coordinator_impl_test',
3744
'topology_coordinator_impl_test.cpp',

src/mongo/db/repl/bgsync.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#include "mongo/db/repl/repl_coordinator_global.h"
4040
#include "mongo/db/repl/rs_sync.h"
4141
#include "mongo/db/repl/rs.h"
42+
#include "mongo/db/repl/rslog.h"
4243
#include "mongo/util/fail_point_service.h"
4344
#include "mongo/util/log.h"
4445
#include "mongo/base/counter.h"

src/mongo/db/repl/connections.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
#include "mongo/db/repl/connections.h"
3636

37+
#include "mongo/db/repl/rslog.h"
3738
#include "mongo/util/log.h"
3839

3940
namespace mongo {

src/mongo/db/repl/consensus.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include "mongo/db/repl/multicmd.h"
3838
#include "mongo/db/repl/repl_coordinator_global.h"
3939
#include "mongo/db/repl/replset_commands.h"
40+
#include "mongo/db/repl/rslog.h"
4041
#include "mongo/util/log.h"
4142

4243
namespace mongo {

src/mongo/db/repl/health.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
#include "mongo/util/goodies.h"
4848
#include "mongo/util/log.h"
4949
#include "mongo/util/mongoutils/html.h"
50-
#include "mongo/util/ramlog.h"
5150

5251
namespace mongo {
5352
namespace repl {
@@ -57,9 +56,6 @@ namespace repl {
5756

5857
using namespace html;
5958

60-
static RamLog * _rsLog = RamLog::get("rs");
61-
Tee* rsLog = _rsLog;
62-
6359
string ago(time_t t) {
6460
if( t == 0 ) return "";
6561

@@ -298,11 +294,6 @@ namespace repl {
298294
s << _table();
299295
}
300296

301-
302-
void fillRsLog(stringstream& s) {
303-
_rsLog->toHTML( s );
304-
}
305-
306297
const Member* ReplSetImpl::findById(unsigned id) const {
307298
if( _self && id == _self->id() ) return _self;
308299

src/mongo/db/repl/health.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,11 @@
3131
#include <ctime>
3232
#include <string>
3333

34-
#include "mongo/logger/tee.h"
35-
3634
namespace mongo {
3735
namespace repl {
3836

39-
void fillRsLog(std::stringstream&);
40-
41-
// ramlog used for replSet actions
42-
extern logger::Tee* rsLog;
43-
4437
// helper function needed by member.cpp
4538
std::string ago(time_t t);
39+
4640
} // namespace repl
4741
} // namespace mongo

src/mongo/db/repl/initial_sync.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "mongo/db/repl/oplog.h"
3535
#include "mongo/db/repl/replset_commands.h"
3636
#include "mongo/db/repl/rs.h"
37+
#include "mongo/db/repl/rslog.h"
3738
#include "mongo/util/log.h"
3839

3940

src/mongo/db/repl/manager.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include "mongo/db/repl/connections.h"
3838
#include "mongo/db/repl/isself.h"
3939
#include "mongo/db/repl/rs.h"
40+
#include "mongo/db/repl/rslog.h"
4041
#include "mongo/db/client.h"
4142
#include "mongo/util/log.h"
4243

src/mongo/db/repl/repl_coordinator_legacy.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
#include "mongo/db/repl/rs.h"
5353
#include "mongo/db/repl/rs_config.h"
5454
#include "mongo/db/repl/rs_initiate.h"
55+
#include "mongo/db/repl/rslog.h"
5556
#include "mongo/db/repl/update_position_args.h"
5657
#include "mongo/db/repl/write_concern.h"
5758
#include "mongo/db/write_concern_options.h"

0 commit comments

Comments
 (0)