tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7952 from Icinga/fix/SO_REUSEPORT-optional 

apilistener: Make SO_REUSEPORT optional
This commit is contained in:
Alexander Aleksandrovič Klimov 2020-10-29 15:56:56 +01:00 committed by GitHub
parent c6e237d184 b5fa7569f2
commit 1e281b060a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/remote/apilistener.cpp
View File

@ -275,7 +275,7 @@ void ApiListener::Start(bool runtimeCreated)
/* Keep this in relative sync with the cold startup in UpdateObjectAuthority() and the reconnect interval above.
* Previous: 60s reconnect, 30s OA, 60s cold startup.
* Now: 10s reconnect, 10s OA, 30s cold startup.
* Now: 10s reconnect, 10s OA, 30s cold startup.
*/
m_AuthorityTimer = new Timer();
m_AuthorityTimer->OnTimerExpired.connect(std::bind(&ApiListener::UpdateObjectAuthority));
@ -386,9 +386,9 @@ bool ApiListener::AddListener(const String& node, const String& service)
const int optTrue = 1;
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast<const char *>(&optTrue), sizeof(optTrue));
#ifndef _WIN32
#ifdef SO_REUSEPORT
setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, reinterpret_cast<const char *>(&optTrue), sizeof(optTrue));
#endif /* _WIN32 */
#endif /* SO_REUSEPORT */
}
acceptor->bind(current->endpoint());