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

Add ability for BroControl to skip cluster setup

Browse source 
It does this by setting the BROCTL_CHECK_CONFIG env. variable.
Related to BIT-1938.
This commit is contained in:
Jon Siwek 2018-06-21 11:55:39 -05:00
parent 66ee376411
commit 8ee92c70da
4 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CHANGES
View file

@ -1,4 +1,12 @@
2.5-671 | 2018-06-21 11:55:39 -0500
* Add ability for BroControl to skip cluster setup (Corelight)
* BIT-1938: fix crash in Broker manager shutdown (Corelight)
* Disable broxygen when running unit tests (Daniel Thayer)
2.5-668 | 2018-06-15 17:14:33 -0500 2.5-668 | 2018-06-15 17:14:33 -0500
* Make old comm. system usages an error unless old_comm_usage_is_ok is set * Make old comm. system usages an error unless old_comm_usage_is_ok is set

2
VERSION
View file

@ -1 +1 @@
2.5-668 2.5-671

2
aux/broctl

@ -1 +1 @@
Subproject commit 99ef926d09a144a9919dec01f6231692e170120e Subproject commit c5dd2ba83dda185d2008731a5cd25b2b8131ac78

3
scripts/base/frameworks/cluster/setup-connections.bro
View file

@ -44,6 +44,9 @@ function connect_peers_with_type(node_type: NodeType)
event bro_init() &priority=-10 event bro_init() &priority=-10
{ {
if ( getenv("BROCTL_CHECK_CONFIG") != "" )
return;
local self = nodes[node]; local self = nodes[node];
for ( i in registered_pools ) for ( i in registered_pools )