Skip to content

Commit e0b2b29

Browse files
authored
Take Server::Options instead of OptionsImpl (envoyproxy#15002)
Use the interface instead of the impl since only the interface methods are needed. Signed-off-by: Alex Konradi <[email protected]>
1 parent d84dbd8 commit e0b2b29

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

source/exe/main_common.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Runtime::LoaderPtr ProdComponentFactory::createRuntime(Server::Instance& server,
4242
return Server::InstanceUtil::createRuntime(server, config);
4343
}
4444

45-
MainCommonBase::MainCommonBase(const OptionsImpl& options, Event::TimeSystem& time_system,
45+
MainCommonBase::MainCommonBase(const Server::Options& options, Event::TimeSystem& time_system,
4646
ListenerHooks& listener_hooks,
4747
Server::ComponentFactory& component_factory,
4848
std::unique_ptr<Random::RandomGenerator>&& random_generator,

source/exe/main_common.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class MainCommonBase {
3636
public:
3737
// Consumer must guarantee that all passed references are alive until this object is
3838
// destructed.
39-
MainCommonBase(const OptionsImpl& options, Event::TimeSystem& time_system,
39+
MainCommonBase(const Server::Options& options, Event::TimeSystem& time_system,
4040
ListenerHooks& listener_hooks, Server::ComponentFactory& component_factory,
4141
std::unique_ptr<Random::RandomGenerator>&& random_generator,
4242
Thread::ThreadFactory& thread_factory, Filesystem::Instance& file_system,
@@ -71,7 +71,7 @@ class MainCommonBase {
7171
// an ifdef in a header file exposed in a C++ library. It is too easy to have
7272
// the ifdef be inconsistent across build-system boundaries.
7373
Grpc::GoogleGrpcContext google_grpc_context_;
74-
const Envoy::OptionsImpl& options_;
74+
const Envoy::Server::Options& options_;
7575
Server::ComponentFactory& component_factory_;
7676
Thread::ThreadFactory& thread_factory_;
7777
Filesystem::Instance& file_system_;

0 commit comments

Comments
 (0)