Skip to content

Commit 026cd8b

Browse files
maxilevfacebook-github-bot
authored andcommitted
Cleanup MRL initialization
Summary: Let's cleanup unused code since new MRL initializer is already being used in prod: https://www.internalfb.com/code/configerator/[18f6e91907d68c4946560bea161a59eefe30deca]/source/thrift/flags_overrides.cconf?lines=11300-11305 Reviewed By: AjanthanAsogamoorthy Differential Revision: D67864414 fbshipit-source-id: 7633da8180537470e44e316a37c9e197df39231a
1 parent 7794275 commit 026cd8b

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

third-party/thrift/src/thrift/lib/cpp2/server/ThriftServer.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ THRIFT_FLAG_DEFINE_bool(server_enable_stoptls, false);
9191

9292
THRIFT_FLAG_DEFINE_bool(enable_mrl_check_for_thrift_server, false);
9393
THRIFT_FLAG_DEFINE_bool(enforce_mrl_check_for_thrift_server, false);
94-
THRIFT_FLAG_DEFINE_bool(migrate_mrl_initializer_for_thrift_server, false);
9594

9695
THRIFT_FLAG_DEFINE_bool(dump_snapshot_on_long_shutdown, true);
9796

@@ -2199,11 +2198,6 @@ folly::observer::Observer<bool> ThriftServer::enforceTLSCertRevocation() {
21992198
return THRIFT_FLAG_OBSERVE(enforce_mrl_check_for_thrift_server);
22002199
}
22012200

2202-
folly::observer::Observer<bool>
2203-
ThriftServer::migrateTLSCertRevocationInitializer() {
2204-
return THRIFT_FLAG_OBSERVE(migrate_mrl_initializer_for_thrift_server);
2205-
}
2206-
22072201
folly::observer::Observer<bool> ThriftServer::enableReceivingDelegatedCreds() {
22082202
return THRIFT_FLAG_OBSERVE(server_fizz_enable_receiving_dc);
22092203
}

third-party/thrift/src/thrift/lib/cpp2/server/ThriftServer.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2316,16 +2316,13 @@ class ThriftServer : public apache::thrift::concurrency::Runnable,
23162316
[observer = std::move(contextObserver),
23172317
tlsRevocationObserver = enableTLSCertRevocation(),
23182318
tlsRevocationEnforcementObserver = enforceTLSCertRevocation(),
2319-
tlsCertRevocationInitializeObserver =
2320-
migrateTLSCertRevocationInitializer(),
23212319
hybridKexObserver = enableHybridKex(),
23222320
aegisObserver = enableAegis(),
23232321
pskModeObserver = preferPskKe(),
23242322
dcReceiveObserver = enableReceivingDelegatedCreds(),
23252323
dcObserver = enablePresentingDelegatedCredentials()]() {
23262324
(void)**tlsRevocationObserver;
23272325
(void)**tlsRevocationEnforcementObserver;
2328-
(void)**tlsCertRevocationInitializeObserver;
23292326
(void)**hybridKexObserver;
23302327
(void)**aegisObserver;
23312328
(void)**pskModeObserver;
@@ -2533,7 +2530,6 @@ class ThriftServer : public apache::thrift::concurrency::Runnable,
25332530

25342531
static folly::observer::Observer<bool> enableTLSCertRevocation();
25352532
static folly::observer::Observer<bool> enforceTLSCertRevocation();
2536-
static folly::observer::Observer<bool> migrateTLSCertRevocationInitializer();
25372533

25382534
static folly::observer::Observer<bool> enableReceivingDelegatedCreds();
25392535

0 commit comments

Comments
 (0)