From da5a0e800e3bd73ea13f7491c47f0e268a34a38e Mon Sep 17 00:00:00 2001 From: Dev Bali Date: Tue, 30 Jul 2019 11:19:06 -0700 Subject: [PATCH] Removed Policy Script for UTF-8 Logs --- scripts/policy/tuning/enable-utf-8-logs.zeek | 4 ---- scripts/test-all-policy.zeek | 1 - .../logging/ascii-utf8-enabled-control-characters.zeek | 2 +- .../logging/ascii-utf8-enabled-set-separator-escape.zeek | 2 +- .../scripts/base/frameworks/logging/ascii-utf8-enabled.zeek | 2 +- 5 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 scripts/policy/tuning/enable-utf-8-logs.zeek diff --git a/scripts/policy/tuning/enable-utf-8-logs.zeek b/scripts/policy/tuning/enable-utf-8-logs.zeek deleted file mode 100644 index 4f8eb3615f..0000000000 --- a/scripts/policy/tuning/enable-utf-8-logs.zeek +++ /dev/null @@ -1,4 +0,0 @@ -##! Loading this script will enable utf-8 characters -##! instead of escaping them into the \xYY format - -redef LogAscii::enable_utf_8=T; diff --git a/scripts/test-all-policy.zeek b/scripts/test-all-policy.zeek index 9b332c8ba7..1741d42a18 100644 --- a/scripts/test-all-policy.zeek +++ b/scripts/test-all-policy.zeek @@ -112,5 +112,4 @@ @load tuning/defaults/packet-fragments.zeek @load tuning/defaults/warnings.zeek @load tuning/json-logs.zeek -#@load tuning/enable-utf-8-logs.zeek @load tuning/track-all-assets.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-utf8-enabled-control-characters.zeek b/testing/btest/scripts/base/frameworks/logging/ascii-utf8-enabled-control-characters.zeek index fd15c13d27..e98a295c0b 100644 --- a/testing/btest/scripts/base/frameworks/logging/ascii-utf8-enabled-control-characters.zeek +++ b/testing/btest/scripts/base/frameworks/logging/ascii-utf8-enabled-control-characters.zeek @@ -2,7 +2,7 @@ # @TEST-EXEC: zeek -b %INPUT # @TEST-EXEC: btest-diff test.log -@load tuning/enable-utf-8-logs +redef LogAscii::enable_utf_8 = T; module Test; export { diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-utf8-enabled-set-separator-escape.zeek b/testing/btest/scripts/base/frameworks/logging/ascii-utf8-enabled-set-separator-escape.zeek index 0f50e7e529..6f6ca1875b 100644 --- a/testing/btest/scripts/base/frameworks/logging/ascii-utf8-enabled-set-separator-escape.zeek +++ b/testing/btest/scripts/base/frameworks/logging/ascii-utf8-enabled-set-separator-escape.zeek @@ -2,7 +2,7 @@ # @TEST-EXEC: zeek -b %INPUT # @TEST-EXEC: btest-diff test.log -@load tuning/enable-utf-8-logs +redef LogAscii::enable_utf_8 = T; redef LogAscii::set_separator = "\xc2\xae"; diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-utf8-enabled.zeek b/testing/btest/scripts/base/frameworks/logging/ascii-utf8-enabled.zeek index ac507eda3b..ac7b1f5daf 100644 --- a/testing/btest/scripts/base/frameworks/logging/ascii-utf8-enabled.zeek +++ b/testing/btest/scripts/base/frameworks/logging/ascii-utf8-enabled.zeek @@ -2,7 +2,7 @@ # @TEST-EXEC: zeek -b %INPUT # @TEST-EXEC: btest-diff test.log -@load tuning/enable-utf-8-logs +redef LogAscii::enable_utf_8 = T; module Test; export {