mirror of
https://github.com/zeek/zeek.git
synced 2025-10-08 01:28:20 +00:00
Removing error check if an ASCII writer has been properly finished.
Turns out that in error situations, the final finish message might not reach the writer anymore, as communication between the threads will be shut down. Instead of aborting, we now just clean up in that case and proceed. This isn't changing any other behaviour. The original error check was in place mostly for helping debug the data flow between the threads anyways. Addresses BIT-1331.
This commit is contained in:
parent
bafd354711
commit
9260638948
3 changed files with 10 additions and 5 deletions
6
CHANGES
6
CHANGES
|
@ -1,4 +1,10 @@
|
||||||
|
|
||||||
|
2.3-697 | 2015-04-15 09:51:15 -0700
|
||||||
|
|
||||||
|
* Removing error check verifyingn that an ASCII writer has been
|
||||||
|
properly finished. Instead of aborting, we now just clean up in
|
||||||
|
that case and proceed. Addresses BIT-1331. (Robin Sommer)
|
||||||
|
|
||||||
2.3-696 | 2015-04-14 15:56:36 -0700
|
2.3-696 | 2015-04-14 15:56:36 -0700
|
||||||
|
|
||||||
* Update sqlite to 3.8.9
|
* Update sqlite to 3.8.9
|
||||||
|
|
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
||||||
2.3-696
|
2.3-697
|
||||||
|
|
|
@ -181,10 +181,9 @@ bool Ascii::InitFormatter()
|
||||||
Ascii::~Ascii()
|
Ascii::~Ascii()
|
||||||
{
|
{
|
||||||
if ( ! ascii_done )
|
if ( ! ascii_done )
|
||||||
{
|
// In case of errors aborting the logging altogether,
|
||||||
fprintf(stderr, "internal error: finish missing\n");
|
// DoFinish() may not have been called.
|
||||||
abort();
|
CloseFile(network_time);
|
||||||
}
|
|
||||||
|
|
||||||
delete formatter;
|
delete formatter;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue