server: factor out MainCommon as a class, with a run method

configs/BUILD

@@ -32,3 +32,8 @@ genrule(
         ":configgen",
     ],
 )
+
+filegroup(
+    name = "google_com_proxy_port_0",
+    srcs = ["google_com_proxy_port_0.json"],
+)

configs/google_com_proxy_port_0.json

@@ -0,0 +1,48 @@
+{
+    "listeners": [{
+        "address": "tcp://127.0.0.1:0",
+        "filters": [{
+            "name": "http_connection_manager",
+            "config": {
+                "codec_type": "auto",
+                "stat_prefix": "ingress_http",
+                "route_config": {
+                    "virtual_hosts": [{
+                        "name": "local_service",
+                        "domains": [
+                            "*"
+                        ],
+                        "routes": [{
+                            "timeout_ms": 0,
+                            "prefix": "/",
+                            "host_rewrite": "www.google.com",
+                            "cluster": "service_google"
+                        }]
+                    }]
+                },
+                "filters": [{
+                    "name": "router",
+                    "config": {}
+                }]
+            }
+        }]
+    }],
+    "admin": {
+        "access_log_path": "/tmp/admin_access.log",
+        "address": "tcp://127.0.0.1:0"
+    },
+    "cluster_manager": {
+        "clusters": [{
+            "name": "service_google",
+            "connect_timeout_ms": 250,
+            "type": "logical_dns",
+            "lb_type": "round_robin",
+            "hosts": [{
+                "url": "tcp://google.com:443"
+            }],
+            "ssl_context": {
+                "sni": "www.google.com"
+            }
+        }]
+    }
+}

include/envoy/server/BUILD

@@ -57,7 +57,10 @@ envoy_cc_library(
 envoy_cc_library(
     name = "hot_restart_interface",
     hdrs = ["hot_restart.h"],
-    deps = ["//include/envoy/event:dispatcher_interface"],
+    deps = [
+        "//include/envoy/event:dispatcher_interface",
+        "//include/envoy/thread:thread_interface",
+    ],
 )
 
 envoy_cc_library(

include/envoy/server/hot_restart.h

@@ -5,6 +5,8 @@
 
 #include "envoy/common/pure.h"
 #include "envoy/event/dispatcher.h"
+#include "envoy/stats/stats.h"
+#include "envoy/thread/thread.h"
 
 namespace Envoy {
 namespace Server {
@@ -78,6 +80,21 @@ class HotRestart {
    * perform a full or hot restart.
    */
   virtual std::string version() PURE;
+
+  /**
+   * @return Thread::BasicLockable& a lock for logging.
+   */
+  virtual Thread::BasicLockable& logLock() PURE;
+
+  /**
+   * @return Thread::BasicLockable& a lock for access logs.
+   */
+  virtual Thread::BasicLockable& accessLogLock() PURE;
+
+  /**
+   * @returns an allocator for stats.
+   */
+  virtual Stats::RawStatDataAllocator& stats_allocator() PURE;
 };
 
 } // namespace Server

include/envoy/stats/stats.h

@@ -281,5 +281,29 @@ class StoreRoot : public Store {
 
 typedef std::unique_ptr<StoreRoot> StoreRootPtr;
 
+struct RawStatData;
+
+/**
+ * Abstract interface for allocating a RawStatData.
+ */
+class RawStatDataAllocator {
+public:
+  virtual ~RawStatDataAllocator() {}
+
+  /**
+   * @return RawStatData* a raw stat data block for a given stat name or nullptr if there is no more
+   *         memory available for stats. The allocator may return a reference counted data location
+   *         by name if one already exists with the same name. This is used for intra-process
+   *         scope swapping as well as inter-process hot restart.
+   */
+  virtual RawStatData* alloc(const std::string& name) PURE;
+
+  /**
+   * Free a raw stat data block. The allocator should handle reference counting and only truly
+   * free the block if it is no longer needed.
+   */
+  virtual void free(RawStatData& data) PURE;
+};
+
 } // namespace Stats
 } // namespace Envoy

source/common/stats/stats_impl.h

@@ -191,28 +191,6 @@ struct RawStatData {
   static size_t& initializeAndGetMutableMaxObjNameLength(size_t configured_size);
 };
 
-/**
- * Abstract interface for allocating a RawStatData.
- */
-class RawStatDataAllocator {
-public:
-  virtual ~RawStatDataAllocator() {}
-
-  /**
-   * @return RawStatData* a raw stat data block for a given stat name or nullptr if there is no more
-   *         memory available for stats. The allocator may return a reference counted data location
-   *         by name if one already exists with the same name. This is used for intra-process
-   *         scope swapping as well as inter-process hot restart.
-   */
-  virtual RawStatData* alloc(const std::string& name) PURE;
-
-  /**
-   * Free a raw stat data block. The allocator should handle reference counting and only truly
-   * free the block if it is no longer needed.
-   */
-  virtual void free(RawStatData& data) PURE;
-};
-
 /**
  * Implementation of the Metric interface. Virtual inheritance is used because the interfaces that
  * will inherit from Metric will have other base classes that will also inherit from Metric.

source/exe/BUILD

@@ -78,14 +78,9 @@ envoy_cc_library(
     deps = [
         ":envoy_main_common_lib",
         ":extra_protocol_proxies_lib",
-        "//source/server:hot_restart_lib",
-        "//source/server:options_lib",
         "//source/server/config/http:lightstep_lib",
         "//source/server/config/http:zipkin_lib",
-    ] + select({
-        "//bazel:disable_signal_trace": [],
-        "//conditions:default": [":sigaction_lib"],
-    }),
+    ],
 )
 
 envoy_cc_library(
@@ -100,7 +95,10 @@ envoy_cc_library(
         "//source/server:hot_restart_nop_lib",
         "//source/server:proto_descriptors_lib",
         "//source/server/config_validation:server_lib",
-    ],
+    ] + select({
+        "//bazel:disable_signal_trace": [],
+        "//conditions:default": [":sigaction_lib"],
+    }),
 )
 
 envoy_cc_library(

source/exe/main.cc

@@ -1,20 +1,5 @@
-#include <iostream>
-#include <memory>
-
 #include "exe/main_common.h"
 
-#ifdef ENVOY_HANDLE_SIGNALS
-#include "exe/signal_action.h"
-#endif
-
-#ifdef ENVOY_HOT_RESTART
-#include "server/hot_restart_impl.h"
-#endif
-
-#include "server/options_impl.h"
-
-#include "spdlog/spdlog.h"
-
 // NOLINT(namespace-envoy)
 
 /**
@@ -24,32 +9,22 @@
  * deployment such as initializing signal handling. It calls main_common
  * after setting up command line options.
  */
-int main(int argc, char** argv) {
-#ifdef ENVOY_HANDLE_SIGNALS
-  // Enabled by default. Control with "bazel --define=signal_trace=disabled"
-  Envoy::SignalAction handle_sigs;
-#endif
-
+int main(int argc, const char** argv) {
+  try {
 #ifdef ENVOY_HOT_RESTART
-  // Enabled by default, except on OS X. Control with "bazel --define=hot_restart=disabled"
-  const Envoy::OptionsImpl::HotRestartVersionCb hot_restart_version_cb =
-      [](uint64_t max_num_stats, uint64_t max_stat_name_len) {
-        return Envoy::Server::HotRestartImpl::hotRestartVersion(max_num_stats, max_stat_name_len);
-      };
+    Envoy::MainCommon main_common(argc, argv, true);
 #else
-  const Envoy::OptionsImpl::HotRestartVersionCb hot_restart_version_cb = [](uint64_t, uint64_t) {
-    return "disabled";
-  };
+    Envoy::MainCommon main_common(argc, argv, false);
 #endif
-
-  std::unique_ptr<Envoy::OptionsImpl> options;
-  try {
-    options = std::make_unique<Envoy::OptionsImpl>(argc, argv, hot_restart_version_cb,
-                                                   spdlog::level::info);
+    return main_common.run() ? 0 : 1;
   } catch (const Envoy::NoServingException& e) {
     return 0;
   } catch (const Envoy::MalformedArgvException& e) {
+    std::cerr << "MalformedArgvException: " << e.what() << std::endl;
+    return 1;
+  } catch (const Envoy::EnvoyException& e) {
+    std::cerr << "EnvoyException: " << e.what() << std::endl;
     return 1;
   }
-  return Envoy::main_common(*options);
+  return 0;
 }