Skip to content

fix init order for EmbeddedNetworkController #2014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 25, 2023
Merged

fix init order for EmbeddedNetworkController #2014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51b8a5f
fix init order for EmbeddedNetworkController
glimberg May 25, 2023
236ae61
Merge branch 'dev' into controller-init-order
glimberg May 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion controller/EmbeddedNetworkController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",""}
Expand Down
6 changes: 3 additions & 3 deletions controller/EmbeddedNetworkController.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,6 @@ class EmbeddedNetworkController : public NetworkController,public DB::ChangeList
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;

Expand All @@ -151,6 +148,9 @@ class EmbeddedNetworkController : public NetworkController,public DB::ChangeList
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;
Expand Down