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

Added optional script and redef bool to enable utf-8 in ASCII logs

Browse source
This commit is contained in:
Dev Bali 2019-07-22 10:28:38 -07:00
parent 6927dd1213
commit 66557d3178
10 changed files with 111 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/logging/writers/ascii/Ascii.cc
View file

@ -23,6 +23,7 @@ Ascii::Ascii(WriterFrontend* frontend) : WriterBackend(frontend)
include_meta = false;
tsv = false;
use_json = false;
enable_utf_8 = false;
formatter = 0;
gzip_level = 0;
gzfile = nullptr;
@ -36,6 +37,7 @@ void Ascii::InitConfigOptions()
output_to_stdout = BifConst::LogAscii::output_to_stdout;
include_meta = BifConst::LogAscii::include_meta;
use_json = BifConst::LogAscii::use_json;
enable_utf_8 = BifConst::LogAscii::enable_utf_8;
gzip_level = BifConst::LogAscii::gzip_level;
separator.assign(
@ -115,6 +117,19 @@ bool Ascii::InitFilterOptions()
}
}
else if ( strcmp(i->first, "enable_utf_8") == 0 )
{
if ( strcmp(i->second, "T") == 0 )
enable_utf_8 = true;
else if ( strcmp(i->second, "F") == 0 )
enable_utf_8 = false;
else
{
Error("invalid value for 'enable_utf_8', must be a string and either \"T\" or \"F\"");
return false;
}
}
else if ( strcmp(i->first, "output_to_stdout") == 0 )
{
if ( strcmp(i->second, "T") == 0 )
@ -181,6 +196,9 @@ bool Ascii::InitFormatter()
}
else
{
// Enable utf-8 if needed
if (enable_utf_8)
desc.EnableUTF8();
// Use the default "Bro logs" format.
desc.EnableEscaping();
desc.AddEscapeSequence(separator);

1
src/logging/writers/ascii/Ascii.h
View file

@ -65,6 +65,7 @@ private:
int gzip_level; // level > 0 enables gzip compression
bool use_json;
bool enable_utf_8;
string json_timestamps;
threading::formatter::Formatter* formatter;

1
src/logging/writers/ascii/ascii.bif
View file

@ -11,5 +11,6 @@ const set_separator: string;
const empty_field: string;
const unset_field: string;
const use_json: bool;
const enable_utf_8: bool;
const json_timestamps: JSON::TimestampFormat;
const gzip_level: count;