mirror of
https://github.com/zeek/zeek.git
synced 2025-10-05 16:18:19 +00:00
Merge remote branch 'remotes/origin/topic/jsiwek/doc-framework'
* remotes/origin/topic/jsiwek/doc-framework: Adding example documentation for a script's use of logging features. Adding &log attribute to static attr_names array. Small typo fix. Bro doc mode now tracks record redefs that extend its field list. BroBifDoc was unneeded; now dead code, so removed. Bro doc mode now only does a "shallow" copy of declared record types Bro's doc mode now terminates after processing bro_init but before net_run Fixes related to `make doc` handling of script summary text (##! comments) Overhaul of "doc" build target for generating policy script documentation. Add parser error hint when in doc mode about checking ## comment syntax. Move stuff related to policy script documentation from doc/ to doc/scripts/ Fixing example.bro's auto-reST generation baseline test.
This commit is contained in:
commit
5cd6394916
40 changed files with 752 additions and 422 deletions
18
src/main.cc
18
src/main.cc
|
@ -9,6 +9,7 @@
|
|||
#include <unistd.h>
|
||||
#include <signal.h>
|
||||
#include <string.h>
|
||||
#include <list>
|
||||
#ifdef HAVE_GETOPT_H
|
||||
#include <getopt.h>
|
||||
#endif
|
||||
|
@ -47,6 +48,7 @@ extern "C" void OPENSSL_add_all_algorithms_conf(void);
|
|||
#include "Stats.h"
|
||||
#include "ConnCompressor.h"
|
||||
#include "DPM.h"
|
||||
#include "BroDoc.h"
|
||||
|
||||
#include "binpac_bro.h"
|
||||
|
||||
|
@ -103,6 +105,8 @@ char* proc_status_file = 0;
|
|||
|
||||
int FLAGS_use_binpac = false;
|
||||
|
||||
extern std::list<BroDoc*> docs_generated;
|
||||
|
||||
// Keep copy of command line
|
||||
int bro_argc;
|
||||
char** bro_argv;
|
||||
|
@ -971,6 +975,20 @@ int main(int argc, char** argv)
|
|||
|
||||
mgr.Drain();
|
||||
|
||||
if ( generate_documentation )
|
||||
{
|
||||
std::list<BroDoc*>::iterator it;
|
||||
|
||||
for ( it = docs_generated.begin(); it != docs_generated.end(); ++it )
|
||||
(*it)->WriteDocFile();
|
||||
|
||||
for ( it = docs_generated.begin(); it != docs_generated.end(); ++it )
|
||||
delete *it;
|
||||
|
||||
terminate_bro();
|
||||
return 0;
|
||||
}
|
||||
|
||||
have_pending_timers = ! reading_traces && timer_mgr->Size() > 0;
|
||||
|
||||
if ( io_sources.Size() > 0 || have_pending_timers )
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue