Skip to content

Add QLoggerFactory support to HQServerTransportFactory #624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Akash-an wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −1
Open

Add QLoggerFactory support to HQServerTransportFactory #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion proxygen/httpserver/samples/hq/HQServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,11 @@ QuicServerTransport::Ptr HQServerTransportFactory::make(
std::shared_ptr<const FizzServerContext> ctx) noexcept {
auto transport = quic::QuicHandshakeSocketHolder::makeServerTransport(
evb, std::move(socket), std::move(ctx), this);
if (!params_.qLoggerPath.empty()) {
if (qloggerFactory_) {
if (auto logger = qloggerFactory_(quic::VantagePoint::Server)) {
transport->setQLogger(std::move(logger));
}
} else if (!params_.qLoggerPath.empty()) {
transport->setQLogger(std::make_shared<HQLoggerHelper>(
params_.qLoggerPath, params_.prettyJson, quic::VantagePoint::Server));
}
Expand Down
8 changes: 8 additions & 0 deletions proxygen/httpserver/samples/hq/HQServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,19 @@ class HQServerTransportFactory
, public quic::EarlyDataAppParamsHandler
, private quic::QuicHandshakeSocketHolder::Callback {
public:
using QLoggerFactory =
std::function<std::shared_ptr<quic::QLogger>(quic::VantagePoint)>;

explicit HQServerTransportFactory(
const HQServerParams& params,
HTTPTransactionHandlerProvider httpTransactionHandlerProvider,
std::function<void(proxygen::HQSession*)> onTransportReadyFn_);
~HQServerTransportFactory() override = default;

void setQLoggerFactory(QLoggerFactory fn) {
qloggerFactory_ = std::move(fn);
}

// Creates new quic server transport
quic::QuicServerTransport::Ptr make(
folly::EventBase* evb,
Expand Down Expand Up @@ -206,6 +213,7 @@ class HQServerTransportFactory
std::map<std::string, AlpnEntry> alpnHandlers_;
proxygen::H3EarlyDataHandler h3EarlyDataHandler_;
quic::EarlyDataAppParamsHandler* defaultEarlyDataHandler_{nullptr};
QLoggerFactory qloggerFactory_;
};

} // namespace quic::samples