Incorporated comment

Signed-off-by: Randy Smith <rdsmith@google.com>
envoyproxy · Apr 19, 2019 · efced47 · efced47
1 parent 6c7aa15
commit efced47
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/source/exe/main_common.cc b/source/exe/main_common.cc
@@ -43,7 +43,7 @@ Runtime::LoaderPtr ProdComponentFactory::createRuntime(Server::Instance& server,
 }
 
 MainCommonBase::MainCommonBase(const OptionsImpl& options, Event::TimeSystem& time_system,
-                               ListenerHooks& test_hooks,
+                               ListenerHooks& listener_hooks,
                                Server::ComponentFactory& component_factory,
                                std::unique_ptr<Runtime::RandomGenerator>&& random_generator,
                                Thread::ThreadFactory& thread_factory,
@@ -85,7 +85,7 @@ MainCommonBase::MainCommonBase(const OptionsImpl& options, Event::TimeSystem& ti
                                                                  restarter_->statsAllocator());
 
     server_ = std::make_unique<Server::InstanceImpl>(
-        options_, time_system, local_address, test_hooks, *restarter_, *stats_store_,
+        options_, time_system, local_address, listener_hooks, *restarter_, *stats_store_,
         access_log_lock, component_factory, std::move(random_generator), *tls_, thread_factory_,
         file_system_);
 
@@ -143,7 +143,7 @@ void MainCommonBase::adminRequest(absl::string_view path_and_query, absl::string
 
 MainCommon::MainCommon(int argc, const char* const* argv)
     : options_(argc, argv, &MainCommon::hotRestartVersion, spdlog::level::info),
-      base_(options_, real_time_system_, default_test_hooks_, prod_component_factory_,
+      base_(options_, real_time_system_, default_listener_hooks_, prod_component_factory_,
             std::make_unique<Runtime::RandomGeneratorImpl>(), platform_impl_.threadFactory(),
             platform_impl_.fileSystem()) {}
 

diff --git a/source/exe/main_common.h b/source/exe/main_common.h
@@ -35,7 +35,7 @@ class MainCommonBase {
   // Consumer must guarantee that all passed references are alive until this object is
   // destructed.
   MainCommonBase(const OptionsImpl& options, Event::TimeSystem& time_system,
-                 ListenerHooks& test_hooks, Server::ComponentFactory& component_factory,
+                 ListenerHooks& listener_hooks, Server::ComponentFactory& component_factory,
                  std::unique_ptr<Runtime::RandomGenerator>&& random_generator,
                  Thread::ThreadFactory& thread_factory, Filesystem::Instance& file_system);
   ~MainCommonBase();
@@ -121,7 +121,7 @@ class MainCommon {
   PlatformImpl platform_impl_;
   Envoy::OptionsImpl options_;
   Event::RealTimeSystem real_time_system_;
-  DefaultListenerHooks default_test_hooks_;
+  DefaultListenerHooks default_listener_hooks_;
   ProdComponentFactory prod_component_factory_;
   MainCommonBase base_;
 };