mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 14:48:21 +00:00
zeek-setup: Support enabling debug streams through env variable
For debugging btests, it can be convenient to enable debug streams by setting an environment variable rather than editing zeek invocations and adding -B selectively. Sample use case: $ export ZEEK_DEBUG_LOG_STREAMS=all $ btest -d core/failing-test.zeek $ less .tmp/core/failing-test/debug.log This change makes Zeek's -B option and ZEEK_DEBUG_LOG_STREAMS are additive.
This commit is contained in:
parent
a27066e3fc
commit
780976bf91
3 changed files with 12 additions and 2 deletions
|
@ -85,6 +85,9 @@ public:
|
|||
|
||||
bool IsEnabled(DebugStream stream) const { return streams[int(stream)].enabled; }
|
||||
|
||||
// Are any streams enabled?
|
||||
bool HasEnabledStreams() const { return ! enabled_streams.empty(); }
|
||||
|
||||
void SetVerbose(bool arg_verbose) { verbose = arg_verbose; }
|
||||
bool IsVerbose() const { return verbose; }
|
||||
|
||||
|
|
|
@ -170,7 +170,10 @@ void usage(const char* prog, int code) {
|
|||
"not set, will use first IPv4 address from /etc/resolv.conf");
|
||||
fprintf(stderr,
|
||||
" $ZEEK_DEBUG_LOG_STDERR | Use stderr for debug logs generated via "
|
||||
"the -B flag");
|
||||
"the -B flag\n");
|
||||
fprintf(stderr,
|
||||
" $ZEEK_DEBUG_LOG_STREAMS | Enable debugging output for selected "
|
||||
"streams (see the -B flag)");
|
||||
|
||||
fprintf(stderr, "\n");
|
||||
|
||||
|
|
|
@ -556,9 +556,13 @@ SetupResult setup(int argc, char** argv, Options* zopts) {
|
|||
reporter->FatalError("-u incompatible with --no-unused-warnings");
|
||||
|
||||
#ifdef DEBUG
|
||||
if ( options.debug_log_streams ) {
|
||||
if ( options.debug_log_streams )
|
||||
debug_logger.EnableStreams(options.debug_log_streams->data());
|
||||
|
||||
if ( const auto* streams = getenv("ZEEK_DEBUG_LOG_STREAMS") )
|
||||
debug_logger.EnableStreams(streams);
|
||||
|
||||
if ( debug_logger.HasEnabledStreams() ) {
|
||||
if ( getenv("ZEEK_DEBUG_LOG_STDERR") )
|
||||
debug_logger.OpenDebugLog(nullptr);
|
||||
else
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue