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

Merge remote-tracking branch 'origin/fastpath'

Browse source 
* origin/fastpath:
  make the documentation of the SQLite reader/writer a bit nicer.
  Wrong example file was included - reported by Michael Auger @LM4K
This commit is contained in:
Robin Sommer 2013-10-25 11:11:17 -07:00
commit 2818bb3dbc
5 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
CHANGES
View file

@ -1,4 +1,15 @@
2.2-beta-157 | 2013-10-25 11:11:17 -0700
* Extend the documentation of the SQLite reader/writer framework.
(Bernhard Amann)
* Fix inclusion of wrong example file in scripting tutorial.
Reported by Michael Auger @LM4K. (Bernhard Amann)
* Alternative fix for the thrading deadlock issue to avoid potential
performance impact. (Bernhard Amann)
2.2-beta-152 | 2013-10-24 18:16:49 -0700 2.2-beta-152 | 2013-10-24 18:16:49 -0700
* Fix for input readers occasionally dead-locking. (Robin Sommer) * Fix for input readers occasionally dead-locking. (Robin Sommer)

2
VERSION
View file

@ -1 +1 @@
2.2-beta-152 2.2-beta-157

2
doc/scripting/index.rst
View file

@ -214,7 +214,7 @@ take a look at a simple script, stored as
``connection_record_01.bro``, that will output the connection record ``connection_record_01.bro``, that will output the connection record
for a single connection. for a single connection.
.. btest-include:: ${DOC_ROOT}/scripting/connection_record_02.bro .. btest-include:: ${DOC_ROOT}/scripting/connection_record_01.bro
Again, we start with ``@load``, this time importing the Again, we start with ``@load``, this time importing the
:doc:`/scripts/base/protocols/conn/index` scripts which supply the tracking :doc:`/scripts/base/protocols/conn/index` scripts which supply the tracking

10
scripts/base/frameworks/input/readers/sqlite.bro
View file

@ -1,6 +1,12 @@
##! Interface for the SQLite input reader. ##! Interface for the SQLite input reader. Redefinable options are available
##! to tweak the input format of the SQLite reader.
##! ##!
##! The defaults are set to match Bro's ASCII output. ##! See :doc:`/frameworks/logging-input-sqlite` for an introduction on how to
##! use the SQLite reader.
##!
##! When using the SQLite reader, you have to specify the SQL query that returns
##! the desired data by setting ``query`` in the ``config`` table. See the
##! introduction mentioned above for an example.
module InputSQLite; module InputSQLite;

10
scripts/base/frameworks/logging/writers/sqlite.bro
View file

@ -1,5 +1,13 @@
##! Interface for the SQLite log writer. Redefinable options are available ##! Interface for the SQLite log writer. Redefinable options are available
##! to tweak the output format of the SQLite reader. ##! to tweak the output format of the SQLite reader.
##!
##! See :doc:`/frameworks/logging-input-sqlite` for an introduction on how to
##! use the SQLite log writer.
##!
##! The SQL writer currently supports one writer-specific filter option via
##! ``config``: setting ``tablename`` sets the name of the table that is used
##! or created in the SQLite database. An example for this is given in the
##! introduction mentioned above.
module LogSQLite; module LogSQLite;