From 90b7c6961e3b149229553f81ee5780c0ae57cce0 Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Wed, 18 Aug 2021 12:35:49 -0700 Subject: [PATCH] Simplify the supervisor's listen() on default address/port --- scripts/base/frameworks/broker/main.zeek | 1 + scripts/base/frameworks/supervisor/main.zeek | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/base/frameworks/broker/main.zeek b/scripts/base/frameworks/broker/main.zeek index 53f6239361..891acbd601 100644 --- a/scripts/base/frameworks/broker/main.zeek +++ b/scripts/base/frameworks/broker/main.zeek @@ -286,6 +286,7 @@ export { global listen: function(a: string &default = default_listen_address, p: port &default = default_port, retry: interval &default = default_listen_retry): port; + ## Initiate a remote connection. ## ## a: an address to connect to, e.g. "localhost" or "127.0.0.1". diff --git a/scripts/base/frameworks/supervisor/main.zeek b/scripts/base/frameworks/supervisor/main.zeek index 8b0161b79e..171ccc6971 100644 --- a/scripts/base/frameworks/supervisor/main.zeek +++ b/scripts/base/frameworks/supervisor/main.zeek @@ -43,9 +43,10 @@ event zeek_init() &priority=10 { if ( Supervisor::is_supervisor() && SupervisorControl::enable_listen ) { - Broker::listen(Broker::default_listen_address, - Broker::default_port, - Broker::default_listen_retry); + # This may fail, possibly with scheduled retries. Any failures + # already get logged by the listen() implementation, so we don't + # report additionally. + Broker::listen(); } Broker::subscribe(SupervisorControl::topic_prefix);