From 8463f14a523f1bd01d1453742c7b3b04be5e1cf2 Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Tue, 14 Dec 2021 18:38:29 -0800 Subject: [PATCH] Move cluster controller/agent main.zeek scripts into their own modules This has no practical relevance other than allowing the two to be loaded a the same time, which some of our (cluster-unrelated) tests require. Absence of namespacing would trigger symbol clashes at this point. --- scripts/policy/frameworks/cluster/agent/main.zeek | 2 ++ scripts/policy/frameworks/cluster/controller/main.zeek | 2 ++ 2 files changed, 4 insertions(+) diff --git a/scripts/policy/frameworks/cluster/agent/main.zeek b/scripts/policy/frameworks/cluster/agent/main.zeek index a70c7c6269..734a55a126 100644 --- a/scripts/policy/frameworks/cluster/agent/main.zeek +++ b/scripts/policy/frameworks/cluster/agent/main.zeek @@ -6,6 +6,8 @@ @load ./api +module ClusterAgent::Runtime; + redef ClusterController::role = ClusterController::Types::AGENT; # The global configuration as passed to us by the controller diff --git a/scripts/policy/frameworks/cluster/controller/main.zeek b/scripts/policy/frameworks/cluster/controller/main.zeek index 835b517ede..a774bba119 100644 --- a/scripts/policy/frameworks/cluster/controller/main.zeek +++ b/scripts/policy/frameworks/cluster/controller/main.zeek @@ -8,6 +8,8 @@ @load ./request @load ./util +module ClusterController::Runtime; + redef ClusterController::role = ClusterController::Types::CONTROLLER; global check_instances_ready: function(insts: set[string], tc: TableChange, inst: string);