diff --git a/NEWS b/NEWS index 35b5678ef9..af8523e02d 100644 --- a/NEWS +++ b/NEWS @@ -491,11 +491,6 @@ Deprecated Functionality - The ``bro_is_terminating`` and ``bro_version`` function are deprecated and replaced by functions named ``zeek_is_terminating`` and ``zeek_version``. -- The ``rotate_file``, ``rotate_file_by_name`` and ``calc_next_rotate`` functions - were marked as deprecated. These functions were used with the old pre-2.0 logging - framework and are no longer used. They also were marked as deprecated in their - documentation, however the functions themselves did not carry the deprecation marker. - Bro 2.6 ======= diff --git a/scripts/base/init-bare.zeek b/scripts/base/init-bare.zeek index 1910dd82fb..23bb5897ef 100644 --- a/scripts/base/init-bare.zeek +++ b/scripts/base/init-bare.zeek @@ -775,8 +775,6 @@ type IPAddrAnonymizationClass: enum { OTHER_ADDR, }; -## Deprecated. -## ## .. zeek:see:: rotate_file rotate_file_by_name type rotate_info: record { old_name: string; ##< Original filename. @@ -4622,7 +4620,7 @@ module GLOBAL; ## BPF filter the user has set via the -f command line options. Empty if none. const cmd_line_bpf_filter = "" &redef; -## Deprecated. +## Base time of log rotations in 24-hour time format (``%H:%M``), e.g. "12:00". const log_rotate_base_time = "0:00" &redef; ## Write profiling info into this file in regular intervals. The easiest way to diff --git a/src/zeek.bif b/src/zeek.bif index 3e2eac3740..be6224d6b7 100644 --- a/src/zeek.bif +++ b/src/zeek.bif @@ -4621,7 +4621,7 @@ function get_file_name%(f: file%): string ## after the rotation, and the time when *f* was opened/closed. ## ## .. zeek:see:: rotate_file_by_name calc_next_rotate -function rotate_file%(f: file%): rotate_info &deprecated +function rotate_file%(f: file%): rotate_info %{ RecordVal* info = f->Rotate(); if ( info ) @@ -4645,7 +4645,7 @@ function rotate_file%(f: file%): rotate_info &deprecated ## after the rotation, and the time when *f* was opened/closed. ## ## .. zeek:see:: rotate_file calc_next_rotate -function rotate_file_by_name%(f: string%): rotate_info &deprecated +function rotate_file_by_name%(f: string%): rotate_info %{ RecordVal* info = new RecordVal(rotate_info); @@ -4699,7 +4699,7 @@ function rotate_file_by_name%(f: string%): rotate_info &deprecated ## Returns: The duration until the next file rotation time. ## ## .. zeek:see:: rotate_file rotate_file_by_name -function calc_next_rotate%(i: interval%) : interval &deprecated +function calc_next_rotate%(i: interval%) : interval %{ const char* base_time = log_rotate_base_time ? log_rotate_base_time->AsString()->CheckString() : 0; diff --git a/testing/btest/Baseline/coverage.bare-mode-errors/errors b/testing/btest/Baseline/coverage.bare-mode-errors/errors index a13c8849a1..e69de29bb2 100644 --- a/testing/btest/Baseline/coverage.bare-mode-errors/errors +++ b/testing/btest/Baseline/coverage.bare-mode-errors/errors @@ -1,4 +0,0 @@ -warning in /Users/johanna/bro/master/scripts/policy/misc/trim-trace-file.zeek, line 25: deprecated (rotate_file_by_name) -warning in /Users/johanna/bro/master/scripts/policy/misc/trim-trace-file.zeek, line 25: deprecated (rotate_file_by_name) -warning in /Users/johanna/bro/master/scripts/policy/misc/trim-trace-file.zeek, line 25: deprecated (rotate_file_by_name) -warning in /Users/johanna/bro/master/testing/btest/../../scripts//policy/misc/trim-trace-file.zeek, line 25: deprecated (rotate_file_by_name)