fix init order for EmbeddedNetworkController (#2014)

2 files changed, 14 insertions, 4 deletions

diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp
index 3f831693..b60c375c 100644
--- a/controller/EmbeddedNetworkController.cpp
+++ b/controller/EmbeddedNetworkController.cpp
@@ -466,11 +466,21 @@ EmbeddedNetworkController::EmbeddedNetworkController(Node *node,const char *ztPa
 	, _node(node)
 	, _ztPath(ztPath)
 	, _path(dbPath)
+	, _signingId()
+	, _signingIdAddressString()
 	, _sender((NetworkController::Sender *)0)
 	, _db(this)
+	, _queue()
+	, _threads()
+	, _threads_l()
+	, _memberStatus()
+	, _memberStatus_l()
+	, _expiringSoon()
+	, _expiringSoon_l()
+	, _rc(rc)
 	, _ssoExpiryRunning(true)
 	, _ssoExpiry(std::thread(&EmbeddedNetworkController::_ssoExpiryThread, this))
-	, _rc(rc)
+
 #ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK	
 	, _member_status_lookup{"nc_member_status_lookup",""}
 	, _member_status_lookup_count{"nc_member_status_lookup_count",""}
diff --git a/controller/EmbeddedNetworkController.hpp b/controller/EmbeddedNetworkController.hpp
index d3f7e78e..ef369be3 100644
--- a/controller/EmbeddedNetworkController.hpp
+++ b/controller/EmbeddedNetworkController.hpp
@@ -139,9 +139,6 @@ private:
 	std::vector<std::thread> _threads;
 	std::mutex _threads_l;
 
-	bool _ssoExpiryRunning;
-	std::thread _ssoExpiry;
-
 	std::unordered_map< _MemberStatusKey,_MemberStatus,_MemberStatusHash > _memberStatus;
 	std::mutex _memberStatus_l;
 
@@ -151,6 +148,9 @@ private:
 	RedisConfig *_rc;
 	std::string _ssoRedirectURL;
 
+	bool _ssoExpiryRunning;
+	std::thread _ssoExpiry;
+
 #ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
 	prometheus::simpleapi::benchmark_family_t _member_status_lookup;
 	prometheus::simpleapi::counter_family_t   _member_status_lookup_count;