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

Merge remote-tracking branch 'origin/topic/awelzel/cluster-at-if-removal'

Browse source 
* origin/topic/awelzel/cluster-at-if-removal:
  test-all-policy: Do not load nodes-experimental/manager.zeek
  cluster/main: Remove extra @if ( Cluster::is_enabled() )

(cherry picked from commit 98e44ee14f)
This commit is contained in:
Tim Wojtulewicz 2023-06-12 11:04:42 -07:00
parent b34e70e6cd
commit d2b534e6b2
5 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/base/frameworks/cluster/main.zeek
View file

@ -347,8 +347,6 @@ function nodeid_topic(id: string): string
return nodeid_topic_prefix + id + "/";
}
@if ( Cluster::is_enabled() )
event Cluster::hello(name: string, id: string) &priority=10
{
if ( name !in nodes )
@ -423,8 +421,6 @@ event zeek_init() &priority=5
Log::create_stream(Cluster::LOG, [$columns=Info, $path="cluster", $policy=log_policy]);
}
@endif
function create_store(name: string, persistent: bool &default=F): Cluster::StoreInfo
{
local info = stores[name];