Skip to content

Commit

Permalink
Back out "Add transport logging to thrift_servers scuba table"
Browse files Browse the repository at this point in the history
Reviewed By: yfeldblum

Differential Revision: D23232709

fbshipit-source-id: ce215686b67a9552c25455ff20cdd5a33cfe14d5
  • Loading branch information
clairezhang-fb authored and facebook-github-bot committed Aug 20, 2020
1 parent b974229 commit 5890ad7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 13 deletions.
4 changes: 0 additions & 4 deletions thrift/lib/cpp2/server/Cpp2Worker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,6 @@ void Cpp2Worker::onNewConnection(
sock->setZeroCopyEnableFunc(func);
}

// log nextProtocolName to scuba
if (!nextProtocolName.empty()) {
server_->setTransport(nextProtocolName);
}
// Check the security protocol
switch (secureTransportType) {
// If no security, peek into the socket to determine type
Expand Down
9 changes: 0 additions & 9 deletions thrift/lib/cpp2/server/ThriftServer.h
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@ class ThriftServer : public apache::thrift::BaseThriftServer,

std::unique_ptr<ThriftProcessor> thriftProcessor_;
std::vector<std::unique_ptr<TransportRoutingHandler>> routingHandlers_;
folly::Optional<std::string> nextProtocol_;

friend class Cpp2Connection;
friend class Cpp2Worker;
Expand Down Expand Up @@ -477,14 +476,6 @@ class ThriftServer : public apache::thrift::BaseThriftServer,
return sslCacheOptions_;
}

void setTransport(const std::string& nextProtocolName) {
nextProtocol_ = nextProtocolName;
}

folly::Optional<std::string> getTransport() const {
return nextProtocol_;
}

wangle::ServerSocketConfig getServerSocketConfig() {
wangle::ServerSocketConfig config;
if (sslContextObserver_.has_value()) {
Expand Down

0 comments on commit 5890ad7

Please sign in to comment.