@@ -208,9 +208,7 @@ class NighthawkServerFactoryContext : public Envoy::Server::Configuration::Serve
208208
209209 Envoy::Regex::Engine& regexEngine () override { return regex_engine_; }
210210
211- Envoy::Init::Manager& initManager () override {
212- PANIC (" NighthawkServerFactoryContext::initManager not implemented" );
213- };
211+ Envoy::Init::Manager& initManager () override { return server_.initManager (); };
214212
215213 Envoy::Grpc::Context& grpcContext () override { return server_.grpcContext (); };
216214
@@ -274,7 +272,7 @@ class NighthawkServerFactoryContext : public Envoy::Server::Configuration::Serve
274272class NighthawkServerInstance : public Envoy ::Server::Instance {
275273public:
276274 NighthawkServerInstance (Envoy::OptRef<Envoy::Server::Admin> admin, Envoy::Api::Api& api,
277- Envoy::Event::Dispatcher& dispatcher,
275+ Envoy::Init::Manager& init_manager, Envoy:: Event::Dispatcher& dispatcher,
278276 Envoy::AccessLog::AccessLogManager& log_manager,
279277 Envoy::Server::Options& options, Envoy::Runtime::Loader& runtime,
280278 Envoy::Singleton::Manager& singleton_manager,
@@ -284,11 +282,11 @@ class NighthawkServerInstance : public Envoy::Server::Instance {
284282 Envoy::Grpc::Context& grpc_context, Envoy::Http::Context& http_context,
285283 Envoy::Router::Context& router_context, Envoy::Stats::StoreRoot& store,
286284 Envoy::Secret::SecretManagerImpl& secret_manager)
287- : admin_(admin), api_(api), dispatcher_(dispatcher ), log_manager_(log_manager ),
288- options_ (options ), runtime_(runtime ), singleton_manager_(singleton_manager ),
289- stats_store_(store ), tls_(tls ), local_info_(local_info ),
290- validation_context_(validation_context ), grpc_context_(grpc_context ),
291- http_context_(http_context), router_context_(router_context),
285+ : admin_(admin), api_(api), init_manager_(init_manager ), dispatcher_(dispatcher ),
286+ log_manager_ (log_manager ), options_(options ), runtime_(runtime ),
287+ singleton_manager_(singleton_manager ), stats_store_(store ), tls_(tls ),
288+ local_info_(local_info ), validation_context_(validation_context ),
289+ grpc_context_(grpc_context), http_context_(http_context), router_context_(router_context),
292290 server_factory_context_(*this ),
293291 http_server_properties_cache_manager_(
294292 server_factory_context_, Envoy::ProtobufMessage::getStrictValidationVisitor(), tls),
@@ -331,9 +329,7 @@ class NighthawkServerInstance : public Envoy::Server::Instance {
331329 Envoy::Server::HotRestart& hotRestart () override {
332330 PANIC (" NighthawkServerInstance::hotRestart not implemented" );
333331 }
334- Envoy::Init::Manager& initManager () override {
335- PANIC (" NighthawkServerInstance::initManager not implemented" );
336- }
332+ Envoy::Init::Manager& initManager () override { return init_manager_; }
337333 Envoy::Server::ListenerManager& listenerManager () override {
338334 PANIC (" NighthawkServerInstance::listenerManager not implemented" );
339335 }
@@ -405,6 +401,7 @@ class NighthawkServerInstance : public Envoy::Server::Instance {
405401private:
406402 Envoy::OptRef<Envoy::Server::Admin> admin_;
407403 Envoy::Api::Api& api_;
404+ Envoy::Init::Manager& init_manager_;
408405 Envoy::Event::Dispatcher& dispatcher_;
409406 Envoy::AccessLog::AccessLogManager& log_manager_;
410407 Envoy::Server::Options& options_;
@@ -1001,9 +998,9 @@ bool ProcessImpl::runInternal(OutputCollector& collector, const UriPtr& tracing_
1001998 runtime_loader_ = *std::move (loader);
1002999
10031000 server_ = std::make_unique<NighthawkServerInstance>(
1004- admin_, *api_, *dispatcher_, access_log_manager_, envoy_options_, *runtime_loader_. get () ,
1005- *singleton_manager_, tls_, *local_info_, validation_context_, grpc_context_ ,
1006- http_context_, router_context_, store_root_, secret_manager_);
1001+ admin_, *api_, init_manager_, *dispatcher_, access_log_manager_, envoy_options_,
1002+ *runtime_loader_. get (), * singleton_manager_, tls_, *local_info_, validation_context_,
1003+ grpc_context_, http_context_, router_context_, store_root_, secret_manager_);
10071004 ssl_context_manager_ =
10081005 std::make_unique<Envoy::Extensions::TransportSockets::Tls::ContextManagerImpl>(
10091006 server_->serverFactoryContext ());
0 commit comments