mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 06:38:20 +00:00
c7860e3238
In supervised nodes, the Supervisor's NodeConfig$scripts vector adds scripts to the end of the user-provided scripts (options.scripts_to_load), so they load _after_ any user-provided ones. This can cause confusing redef pitfalls when users expect their customizations to run last, as they normally do. This adds two members in Supervisor::NodeConfig, `addl_base_scripts` and `addl_user_scripts`, to store scripts to load before and after the user scripts, respectively. The latter serves the same purpose as the old `scripts` member, which is still there but deprecated (in scriptland only). It functions as before, after any scripts added via `addl_user_scripts`.
101 lines
2.5 KiB
Text
101 lines
2.5 KiB
Text
# @TEST-PORT: BROKER_PORT
|
|
# @TEST-EXEC: btest-bg-run zeek zeek -j -b %INPUT
|
|
# @TEST-EXEC: btest-bg-wait 30
|
|
# @TEST-EXEC: btest-diff zeek/supervisor.out
|
|
# @TEST-EXEC: btest-diff zeek/node.out
|
|
|
|
# So the supervised node doesn't terminate right away.
|
|
redef exit_only_after_terminate=T;
|
|
|
|
global supervisor_output_file: file;
|
|
global node_output_file: file;
|
|
global topic = "test-topic";
|
|
|
|
event do_destroy()
|
|
{
|
|
print supervisor_output_file, "destroying node";
|
|
Supervisor::destroy("grault");
|
|
}
|
|
|
|
event zeek_init()
|
|
{
|
|
if ( Supervisor::is_supervisor() )
|
|
{
|
|
Broker::subscribe(topic);
|
|
Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT")));
|
|
supervisor_output_file = open("supervisor.out");
|
|
print supervisor_output_file, "supervisor zeek_init()";
|
|
local sn = Supervisor::NodeConfig($name="grault",
|
|
$addl_base_scripts=vector("../addl_base_script.zeek"),
|
|
$addl_user_scripts=vector("../addl_user_script.zeek"),
|
|
$scripts=vector("../script.zeek"));
|
|
local res = Supervisor::create(sn);
|
|
|
|
if ( res != "" )
|
|
print supervisor_output_file, res;
|
|
}
|
|
else
|
|
{
|
|
Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT")));
|
|
node_output_file = open("node.out");
|
|
|
|
@ifdef ( Pre::counter )
|
|
# Even though this else-block runs only in the supervised node,
|
|
# it still needs to parse correctly in the Supervisor, so we
|
|
# need to condition this with availability of the counter (which
|
|
# only exists in the supervised node).
|
|
++Pre::counter;
|
|
print node_output_file, fmt("supervised node zeek_init(), counter at %s", Pre::counter);
|
|
@endif
|
|
}
|
|
}
|
|
|
|
event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
|
|
{
|
|
if ( Supervisor::is_supervised() )
|
|
Broker::publish(topic, do_destroy);
|
|
}
|
|
|
|
event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string)
|
|
{
|
|
# Should only be run by supervisor
|
|
terminate();
|
|
}
|
|
|
|
event zeek_done()
|
|
{
|
|
if ( Supervisor::is_supervised() )
|
|
print node_output_file, "supervised node zeek_done()";
|
|
else
|
|
print supervisor_output_file, "supervisor zeek_done()";
|
|
}
|
|
|
|
@TEST-START-FILE addl_base_script.zeek
|
|
|
|
module Pre;
|
|
|
|
export {
|
|
global counter = 0;
|
|
}
|
|
|
|
@TEST-END-FILE
|
|
|
|
@TEST-START-FILE addl_user_script.zeek
|
|
|
|
event zeek_init() &priority=-10
|
|
{
|
|
++Pre::counter;
|
|
print node_output_file, fmt("supervised node loaded addl_user_script.zeek, counter at %s", Pre::counter);
|
|
}
|
|
|
|
@TEST-END-FILE
|
|
|
|
@TEST-START-FILE script.zeek
|
|
|
|
event zeek_init() &priority=-20
|
|
{
|
|
++Pre::counter;
|
|
print node_output_file, fmt("supervised node loaded script.zeek, counter at %s", Pre::counter);
|
|
}
|
|
|
|
@TEST-END-FILE
|