Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove state_dir and state_write_delay options

Browse source 
Since associated functionality was already removed
This commit is contained in:
Jon Siwek 2019-05-21 09:17:53 -07:00
parent f0c266eac1
commit d6096b1618
7 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,4 +1,10 @@
2.6-318 | 2019-05-21 09:17:53 -0700
* Remove state_dir and state_write_delay options (Jon Siwek, Corelight)
* Remove a reference to &synchronized from docs (Jon Siwek, Corelight)
2.6-316 | 2019-05-20 20:56:46 -0700 2.6-316 | 2019-05-20 20:56:46 -0700
* Additional Bro to Zeek renaming (Daniel Thayer) * Additional Bro to Zeek renaming (Daniel Thayer)

2
NEWS
View file

@ -298,6 +298,8 @@ Removed Functionality
- ``log_rotate_interval`` - ``log_rotate_interval``
- ``log_max_size`` - ``log_max_size``
- ``log_encryption_key`` - ``log_encryption_key``
- ``state_dir``
- ``state_write_delay``
- The following constants were used as part of deprecated functionality in version 2.6 - The following constants were used as part of deprecated functionality in version 2.6
or below and are removed from this release: or below and are removed from this release:

2
VERSION
View file

@ -1 +1 @@
2.6-316 2.6-318

2
doc

@ -1 +1 @@
Subproject commit 0919a6e5afb92868da01a7a6bc8911f17797fd24 Subproject commit 8c3395b7e3b1bdbe03bbdd3e290f98414a307651

9
scripts/base/init-bare.zeek
View file

@ -1801,15 +1801,6 @@ global log_file_name: function(tag: string): string &redef;
## Deprecated. This is superseded by the new logging framework. ## Deprecated. This is superseded by the new logging framework.
global open_log_file: function(tag: string): file &redef; global open_log_file: function(tag: string): file &redef;
## Specifies a directory for Zeek to store its persistent state. All globals can
## be declared persistent via the :zeek:attr:`&persistent` attribute.
const state_dir = ".state" &redef;
## Length of the delays inserted when storing state incrementally. To avoid
## dropping packets when serializing larger volumes of persistent state to
## disk, Zeek interleaves the operation with continued packet processing.
const state_write_delay = 0.01 secs &redef;
global done_with_network = F; global done_with_network = F;
event net_done(t: time) { done_with_network = T; } event net_done(t: time) { done_with_network = T; }

6
src/NetVar.cc
View file

@ -155,9 +155,6 @@ RecordType* packet_type;
double connection_status_update_interval; double connection_status_update_interval;
StringVal* state_dir;
double state_write_delay;
int orig_addr_anonymization, resp_addr_anonymization; int orig_addr_anonymization, resp_addr_anonymization;
int other_addr_anonymization; int other_addr_anonymization;
TableVal* preserve_orig_addr; TableVal* preserve_orig_addr;
@ -242,9 +239,6 @@ void init_general_global_var()
table_expire_delay = opt_internal_double("table_expire_delay"); table_expire_delay = opt_internal_double("table_expire_delay");
table_incremental_step = opt_internal_int("table_incremental_step"); table_incremental_step = opt_internal_int("table_incremental_step");
state_dir = internal_val("state_dir")->AsStringVal();
state_write_delay = opt_internal_double("state_write_delay");
max_files_in_cache = opt_internal_int("max_files_in_cache"); max_files_in_cache = opt_internal_int("max_files_in_cache");
rotate_info = internal_type("rotate_info")->AsRecordType(); rotate_info = internal_type("rotate_info")->AsRecordType();
log_rotate_base_time = opt_internal_string("log_rotate_base_time"); log_rotate_base_time = opt_internal_string("log_rotate_base_time");

3
src/NetVar.h
View file

@ -164,9 +164,6 @@ extern TableVal* preserve_other_addr;
extern double connection_status_update_interval; extern double connection_status_update_interval;
extern StringVal* state_dir;
extern double state_write_delay;
extern int max_files_in_cache; extern int max_files_in_cache;
extern RecordType* rotate_info; extern RecordType* rotate_info;
extern StringVal* log_rotate_base_time; extern StringVal* log_rotate_base_time;