aboutsummaryrefslogtreecommitdiffstats
path: root/configd
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@vespa.ai>2024-05-07 13:40:14 +0000
committerTor Brede Vekterli <vekterli@vespa.ai>2024-05-07 13:40:14 +0000
commit3ac44199ef6288a7aca753f0bab9acfd37161062 (patch)
tree5da3a3e16c976543d578e845a36e7fb48c7e4900 /configd
parent14b7d07ef53a7221a4d0156474653b08f3fc3c9a (diff)
Move fd vector clearing into update-function
This way is more self-contained and leaves less room for accidentall fd reuse.
Diffstat (limited to 'configd')
-rw-r--r--configd/src/apps/sentinel/manager.cpp1
-rw-r--r--configd/src/apps/sentinel/sentinel.cpp1
2 files changed, 1 insertions, 1 deletions
diff --git a/configd/src/apps/sentinel/manager.cpp b/configd/src/apps/sentinel/manager.cpp
index f6a74774610..9ee259bb892 100644
--- a/configd/src/apps/sentinel/manager.cpp
+++ b/configd/src/apps/sentinel/manager.cpp
@@ -172,6 +172,7 @@ Manager::handleChildDeaths()
void
Manager::updateActiveFdset(std::vector<pollfd> &fds)
{
+ fds.clear();
for (const OutputConnection *c : _outputConnections) {
int fd = c->fd();
if (fd >= 0) {
diff --git a/configd/src/apps/sentinel/sentinel.cpp b/configd/src/apps/sentinel/sentinel.cpp
index a327769e706..db9f73ea76d 100644
--- a/configd/src/apps/sentinel/sentinel.cpp
+++ b/configd/src/apps/sentinel/sentinel.cpp
@@ -103,7 +103,6 @@ main(int argc, char **argv)
if (vespalib::SignalHandler::CHLD.check()) {
continue;
}
- fds.clear();
manager.updateActiveFdset(fds);
constexpr int poll_timeout_ms = 100;