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

cluster/setup-connections: Switch to Cluster::subscribe(), short-circuit broker

Browse source 
For the time being, this is easiest, otherwise we'd need to
conditionally load a broker-specific policy script based on
Cluster::backend being set.
This commit is contained in:
Arne Welzel 2024-11-13 20:39:43 +01:00
parent 9ec872d161
commit fc12be1f17
1 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

42
scripts/base/frameworks/cluster/setup-connections.zeek
View file

@ -69,7 +69,7 @@ event zeek_init() &priority=-10
local pool = registered_pools[i]; local pool = registered_pools[i];
if ( node in pool$nodes ) if ( node in pool$nodes )
Broker::subscribe(pool$spec$topic); Cluster::subscribe(pool$spec$topic);
} }
switch ( self$node_type ) { switch ( self$node_type ) {
@ -78,29 +78,47 @@ event zeek_init() &priority=-10
case CONTROL: case CONTROL:
break; break;
case LOGGER: case LOGGER:
Broker::subscribe(Cluster::logger_topic); Cluster::subscribe(Cluster::logger_topic);
Broker::subscribe(Broker::default_log_topic_prefix);
break; break;
case MANAGER: case MANAGER:
Broker::subscribe(Cluster::manager_topic); Cluster::subscribe(Cluster::manager_topic);
if ( Cluster::manager_is_logger )
Broker::subscribe(Broker::default_log_topic_prefix);
break; break;
case PROXY: case PROXY:
Broker::subscribe(Cluster::proxy_topic); Cluster::subscribe(Cluster::proxy_topic);
break; break;
case WORKER: case WORKER:
Broker::subscribe(Cluster::worker_topic); Cluster::subscribe(Cluster::worker_topic);
break; break;
default: default:
Reporter::error(fmt("Unhandled cluster node type: %s", self$node_type)); Reporter::error(fmt("Unhandled cluster node type: %s", self$node_type));
return; return;
} }
Broker::subscribe(nodeid_topic(Broker::node_id())); Cluster::subscribe(nodeid_topic(Broker::node_id()));
Broker::subscribe(node_topic(node)); Cluster::subscribe(node_topic(node));
# Listening and connecting to other peers is broker specific,
# short circuit if Zeek is configured with a different
# cluster backend.
#
# In the future, this could move into a policy script, but
# for the time being it's easier for backwards compatibility
# to keep this here.
if ( Cluster::backend != Cluster::CLUSTER_BACKEND_BROKER )
return;
# Logging setup: Anything handling logging additionally subscribes
# to Broker::default_log_topic_prefix.
switch ( self$node_type ) {
case LOGGER:
Cluster::subscribe(Broker::default_log_topic_prefix);
break;
case MANAGER:
if ( Cluster::manager_is_logger )
Cluster::subscribe(Broker::default_log_topic_prefix);
break;
}
if ( self$p != 0/unknown ) if ( self$p != 0/unknown )
{ {