diff --git a/CHANGES b/CHANGES index 7302c445dc..4ba59d8191 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.6-beta2-64 | 2018-11-02 08:56:59 -0500 + + * Improve a weird stats unit test (Jon Siwek, Corelight) + 2.6-beta2-62 | 2018-11-01 20:39:07 -0500 * Fix Travis script typo (Jon Siwek, Corelight) diff --git a/VERSION b/VERSION index c5463f0f2a..441d9a067e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6-beta2-62 +2.6-beta2-64 diff --git a/testing/btest/scripts/policy/misc/weird-stats-cluster.bro b/testing/btest/scripts/policy/misc/weird-stats-cluster.bro index 492b682c4d..a0652ed05b 100644 --- a/testing/btest/scripts/policy/misc/weird-stats-cluster.bro +++ b/testing/btest/scripts/policy/misc/weird-stats-cluster.bro @@ -38,11 +38,7 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) event ready_again() { Reporter::net_weird("weird1"); - - if ( Cluster::node == "worker-2" ) - { - schedule 5secs { terminate_me() }; - } + schedule 5secs { terminate_me() }; } event ready_for_data() @@ -75,19 +71,14 @@ event ready_for_data() @if ( Cluster::local_node_type() == Cluster::MANAGER ) -event bro_init() - { - Broker::auto_publish(Cluster::worker_topic, ready_for_data); - } - global peer_count = 0; -event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) +event Cluster::node_up(name: string, id: string) { ++peer_count; if ( peer_count == 2 ) - event ready_for_data(); + Broker::publish(Cluster::worker_topic, ready_for_data); } @endif