Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/timw/freebsd-warning'

Browse source 
* origin/topic/timw/freebsd-warning:
  Fix a compile warning on FreeBSD
This commit is contained in:
Tim Wojtulewicz 2021-07-08 18:00:26 -07:00
commit f8389c92e0
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
4.1.0-dev.918 | 2021-07-08 18:00:26 -0700
* Fix a compile warning on FreeBSD (Tim Wojtulewicz, Corelight)
4.1.0-dev.916 | 2021-07-08 16:49:55 -0700 4.1.0-dev.916 | 2021-07-08 16:49:55 -0700

2
VERSION
View file

@ -1 +1 @@
4.1.0-dev.916 4.1.0-dev.918

4
src/supervisor/Supervisor.cc
View file

@ -766,7 +766,9 @@ void Stem::Destroy(SupervisorNode* node) const
usleep(10); usleep(10);
if ( Wait(node, WNOHANG) ) if ( Wait(node, WNOHANG) )
{
break; break;
}
DBG_STEM("Stem waiting to destroy node: %s (PID %d)", DBG_STEM("Stem waiting to destroy node: %s (PID %d)",
node->Name().data(), node->pid); node->Name().data(), node->pid);
@ -900,7 +902,9 @@ void Stem::Shutdown(int exit_code)
auto nodes_alive = AliveNodeCount(); auto nodes_alive = AliveNodeCount();
if ( nodes_alive == 0 ) if ( nodes_alive == 0 )
{
exit(exit_code); exit(exit_code);
}
DBG_STEM("Stem nodes still alive %d, sleeping for %d seconds", DBG_STEM("Stem nodes still alive %d, sleeping for %d seconds",
nodes_alive, kill_delay); nodes_alive, kill_delay);