diff --git a/source/server/server.cc b/source/server/server.cc index a01ee0e5ca00..7c298e7da6a2 100644 --- a/source/server/server.cc +++ b/source/server/server.cc @@ -82,11 +82,11 @@ InstanceImpl::InstanceImpl( process_context ? ProcessContextOptRef(std::ref(*process_context)) : absl::nullopt, watermark_factory)), dispatcher_(api_->allocateDispatcher("main_thread")), + access_log_manager_(options.fileFlushIntervalMsec(), *api_, *dispatcher_, access_log_lock, + store), singleton_manager_(new Singleton::ManagerImpl(api_->threadFactory())), handler_(new ConnectionHandlerImpl(*dispatcher_, absl::nullopt)), listener_component_factory_(*this), worker_factory_(thread_local_, *api_, hooks), - access_log_manager_(options.fileFlushIntervalMsec(), *api_, *dispatcher_, access_log_lock, - store), terminated_(false), mutex_tracer_(options.mutexTracingEnabled() ? &Envoy::MutexTracerImpl::getOrCreateTracer() : nullptr), diff --git a/source/server/server.h b/source/server/server.h index 3d93279e1ea7..cb5a54309e1a 100644 --- a/source/server/server.h +++ b/source/server/server.h @@ -354,6 +354,7 @@ class InstanceImpl final : Logger::Loggable, envoy::config::bootstrap::v3::Bootstrap bootstrap_; Api::ApiPtr api_; Event::DispatcherPtr dispatcher_; + AccessLog::AccessLogManagerImpl access_log_manager_; std::unique_ptr admin_; Singleton::ManagerPtr singleton_manager_; Network::ConnectionHandlerPtr handler_; @@ -369,7 +370,6 @@ class InstanceImpl final : Logger::Loggable, Network::DnsResolverSharedPtr dns_resolver_; Event::TimerPtr stat_flush_timer_; DrainManagerPtr drain_manager_; - AccessLog::AccessLogManagerImpl access_log_manager_; std::unique_ptr cluster_manager_factory_; std::unique_ptr main_thread_guard_dog_; std::unique_ptr worker_guard_dog_;