Skip to content

Commit

Permalink
Cleanup MRL initialization
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Max Gulyaev authored and facebook-github-bot committed Jan 7, 2025
1 parent 7749516 commit 73e7296
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
6 changes: 0 additions & 6 deletions thrift/lib/cpp2/server/ThriftServer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ THRIFT_FLAG_DEFINE_bool(server_enable_stoptls, false);

THRIFT_FLAG_DEFINE_bool(enable_mrl_check_for_thrift_server, false);
THRIFT_FLAG_DEFINE_bool(enforce_mrl_check_for_thrift_server, false);
THRIFT_FLAG_DEFINE_bool(migrate_mrl_initializer_for_thrift_server, false);

THRIFT_FLAG_DEFINE_bool(dump_snapshot_on_long_shutdown, true);

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

folly::observer::Observer<bool>
ThriftServer::migrateTLSCertRevocationInitializer() {
return THRIFT_FLAG_OBSERVE(migrate_mrl_initializer_for_thrift_server);
}

folly::observer::Observer<bool> ThriftServer::enableReceivingDelegatedCreds() {
return THRIFT_FLAG_OBSERVE(server_fizz_enable_receiving_dc);
}
Expand Down
4 changes: 0 additions & 4 deletions thrift/lib/cpp2/server/ThriftServer.h
Original file line number Diff line number Diff line change
Expand Up @@ -2316,16 +2316,13 @@ class ThriftServer : public apache::thrift::concurrency::Runnable,
[observer = std::move(contextObserver),
tlsRevocationObserver = enableTLSCertRevocation(),
tlsRevocationEnforcementObserver = enforceTLSCertRevocation(),
tlsCertRevocationInitializeObserver =
migrateTLSCertRevocationInitializer(),
hybridKexObserver = enableHybridKex(),
aegisObserver = enableAegis(),
pskModeObserver = preferPskKe(),
dcReceiveObserver = enableReceivingDelegatedCreds(),
dcObserver = enablePresentingDelegatedCredentials()]() {
(void)**tlsRevocationObserver;
(void)**tlsRevocationEnforcementObserver;
(void)**tlsCertRevocationInitializeObserver;
(void)**hybridKexObserver;
(void)**aegisObserver;
(void)**pskModeObserver;
Expand Down Expand Up @@ -2533,7 +2530,6 @@ class ThriftServer : public apache::thrift::concurrency::Runnable,

static folly::observer::Observer<bool> enableTLSCertRevocation();
static folly::observer::Observer<bool> enforceTLSCertRevocation();
static folly::observer::Observer<bool> migrateTLSCertRevocationInitializer();

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

Expand Down

0 comments on commit 73e7296

Please sign in to comment.