Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-08 09:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/topic/jsiwek/autodoc-fixes'

Browse source 
* origin/topic/jsiwek/autodoc-fixes:
  Update doc sources and touch up a few script comments.
  Fixes for script auto-documentation.

Conflicts:
	scripts/base/frameworks/logging/main.bro
This commit is contained in:
Robin Sommer 2011-08-13 10:31:38 -07:00
commit 1ca9def9e6
43 changed files with 260 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/base/frameworks/cluster/nodes/manager.bro
View file

@ -10,7 +10,7 @@
@prefixes += cluster-manager
## Load the script for local site configuration for the manager node.
# Load the script for local site configuration for the manager node.
@load site/local-manager
## Turn off remote logging since this is the manager and should only log here.

2
scripts/base/frameworks/cluster/nodes/proxy.bro
View file

@ -1,7 +1,7 @@
@prefixes += cluster-proxy
## Load the script for local site configuration for proxy nodes.
# Load the script for local site configuration for proxy nodes.
@load site/local-proxy
## The proxy only syncs state; does not forward events.

2
scripts/base/frameworks/cluster/nodes/worker.bro
View file

@ -1,7 +1,7 @@
@prefixes += cluster-worker
## Load the script for local site configuration for the worker nodes.
# Load the script for local site configuration for the worker nodes.
@load site/local-worker
## Don't do any local logging.

2
scripts/base/frameworks/cluster/setup-connections.bro
View file

@ -1,3 +1,5 @@
@load ./main
@load base/frameworks/communication/main
module Cluster;

2
scripts/base/frameworks/communication/__load__.bro
View file

@ -1 +1 @@
@load ./main
@load ./main

3
scripts/base/frameworks/notice/actions/email_admin.bro
View file

@ -1,4 +1,3 @@
module Notice;
export {
@ -25,4 +24,4 @@ event notice(n: Notice::Info) &priority=-5
if ( email != "" )
email_notice_to(n, email, T);
}
}
}

2
scripts/base/frameworks/notice/extend-email/hostnames.bro
View file

@ -37,4 +37,4 @@ event Notice::notice(n: Notice::Info) &priority=10
if ( output != "" )
n$email_body_sections[|n$email_body_sections|] = output;
}
}

1
scripts/base/frameworks/notice/weird.bro
View file

@ -1,4 +1,3 @@
module Weird;
export {