Merge remote-tracking branch 'origin/topic/jsiwek/local-node-order'

* origin/topic/jsiwek/local-node-order:
  Omit loading local-<node>.bro scripts from base cluster framework. The loading of these is better handled by BroControl and it seems odd to load them from a base/ script anyway since they'll contain site/policy specific code.
This commit is contained in:
Robin Sommer 2011-12-06 11:44:37 -08:00
commit 8ecbfb6284

View file

@ -28,17 +28,14 @@ redef Communication::listen_port = Cluster::nodes[Cluster::node]$p;
@if ( Cluster::local_node_type() == Cluster::MANAGER )
@load ./nodes/manager
@load site/local-manager
@endif
@if ( Cluster::local_node_type() == Cluster::PROXY )
@load ./nodes/proxy
@load site/local-proxy
@endif
@if ( Cluster::local_node_type() == Cluster::WORKER )
@load ./nodes/worker
@load site/local-worker
@endif
@endif