From a851ad7a159b911844e2ca348b48549b8e469997 Mon Sep 17 00:00:00 2001 From: Lita Cho Date: Thu, 15 Feb 2018 14:24:21 -0800 Subject: [PATCH 1/7] Revert "stats: Reorganize tags into a map> to avoid initiating multiple regexes that don't match. (#2582)" This reverts commit 9c728a005a20d7a2058aa8624759f14f28a18d3c. From 49574537d8782a4be09917fa8dd502238783ed7e Mon Sep 17 00:00:00 2001 From: Lita Cho Date: Thu, 15 Feb 2018 14:24:21 -0800 Subject: [PATCH 2/7] Revert "grpc: SSL credential support for Google gRPC client. (#2598)" This reverts commit d0aea18599538677e603356e0fa7ce0971f37519. From a1ebb80c821e56bb53d1117bf0fcc863eee45968 Mon Sep 17 00:00:00 2001 From: Lita Cho Date: Thu, 15 Feb 2018 14:24:21 -0800 Subject: [PATCH 3/7] Revert "listener: Use v4-mapped addressing consistently. (#2572)" This reverts commit 508c7baefc5fb8724c412b9ba05d80d79785aea2. From 9c255b4f92c173abffdcc0d67d069f10cf339a40 Mon Sep 17 00:00:00 2001 From: Lita Cho Date: Thu, 15 Feb 2018 14:24:21 -0800 Subject: [PATCH 4/7] Revert "Add cli flag '--disable-hot-restart'. (#2576)" This reverts commit 02c34e016d1842c71c18f467958a5c85d0dc6cf8. From 3d049f56403c2c0e01e4518f0ca7d6a16c9cbcca Mon Sep 17 00:00:00 2001 From: Lita Cho Date: Thu, 15 Feb 2018 14:24:21 -0800 Subject: [PATCH 5/7] Revert "ssl: fix handshake hang that manifested on OS X. (#2624)" This reverts commit df8007ec7950a48f68028b0115f31a14f3a05903. From def4128744c8af08d7fdbf01894466595d22c6a1 Mon Sep 17 00:00:00 2001 From: Lita Cho Date: Thu, 15 Feb 2018 14:24:21 -0800 Subject: [PATCH 6/7] Revert "server: un-revert #2568 with a fix to initialize logging before validation (#2623)" This reverts commit 89b1ea686084cc4abaa888a9c6d72dec1c2296a5. From a11646a88d1f2cb50e7280a16798be1f55f802ba Mon Sep 17 00:00:00 2001 From: Lita Cho Date: Thu, 15 Feb 2018 14:24:21 -0800 Subject: [PATCH 7/7] Revert "Assert fail if we attempt to create a thread without having initialized logging. (#2619)" This reverts commit 98fe3e8e977b94649e086c0c2703dd88900a6bd4. --- source/common/common/logger.h | 10 ---------- source/common/common/thread.cc | 2 -- 2 files changed, 12 deletions(-) diff --git a/source/common/common/logger.h b/source/common/common/logger.h index 8fb1548f6628a..a50616cc62aee 100644 --- a/source/common/common/logger.h +++ b/source/common/common/logger.h @@ -97,11 +97,6 @@ class LockingStderrOrFileSink : public spdlog::sinks::sink { void log(const spdlog::details::log_msg& msg) override; void flush() override; - /** - * @return bool whether a lock has been established. - */ - bool hasLock() const { return lock_ != nullptr; } - private: Thread::BasicLockable* lock_{}; Filesystem::FileSharedPtr log_file_; @@ -137,11 +132,6 @@ class Registry { */ static const std::vector& loggers() { return allLoggers(); } - /** - * @Return bool whether the registry has been initialized. - */ - static bool initialized() { return getSink()->hasLock(); } - private: /* * @return std::vector& return the installed loggers. diff --git a/source/common/common/thread.cc b/source/common/common/thread.cc index bb8b3a49126db..153322c44aa03 100644 --- a/source/common/common/thread.cc +++ b/source/common/common/thread.cc @@ -9,14 +9,12 @@ #include #include "common/common/assert.h" -#include "common/common/logger.h" #include "common/common/macros.h" namespace Envoy { namespace Thread { Thread::Thread(std::function thread_routine) : thread_routine_(thread_routine) { - RELEASE_ASSERT(Logger::Registry::initialized()); int rc = pthread_create(&thread_id_, nullptr, [](void* arg) -> void* { static_cast(arg)->thread_routine_();