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

actually make sqlite work again (tests passed because the writer

Browse source 
was not actually defined because of the define.)
This commit is contained in:
Bernhard Amann 2013-05-13 19:27:11 -07:00
parent 2b8c2f2316
commit 6c99df508c
10 changed files with 179 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/input/Manager.cc
View file

@ -9,9 +9,7 @@
#include "readers/Raw.h"
#include "readers/Benchmark.h"
#ifdef USE_SQLITE
#include "readers/SQLite.h"
#endif
#include "Event.h"
#include "EventHandler.h"
@ -38,9 +36,7 @@ ReaderDefinition input_readers[] = {
{ BifEnum::Input::READER_ASCII, "Ascii", 0, reader::Ascii::Instantiate },
{ BifEnum::Input::READER_RAW, "Raw", 0, reader::Raw::Instantiate },
{ BifEnum::Input::READER_BENCHMARK, "Benchmark", 0, reader::Benchmark::Instantiate },
#ifdef USE_SQLITE
{ BifEnum::Input::READER_SQLITE, "SQLite", 0, reader::SQLite::Instantiate },
#endif
// End marker
{ BifEnum::Input::READER_DEFAULT, "None", 0, (ReaderBackend* (*)(ReaderFrontend* frontend))0 }

3
src/input/readers/SQLite.cc
View file

@ -2,8 +2,6 @@
#include "config.h"
#ifdef USE_SQLITE
#include "SQLite.h"
#include "NetVar.h"
@ -321,4 +319,3 @@ bool SQLite::DoUpdate()
return true;
}
#endif /* USE_SQLITE */

6
src/input/readers/SQLite.h
View file

@ -6,15 +6,13 @@
#include "config.h"
#ifdef USE_SQLITE
#include <iostream>
#include <vector>
#include "../ReaderBackend.h"
#include "../../threading/AsciiFormatter.h"
#include "../external/sqlite3.h"
#include "../../external/sqlite3.h"
namespace input { namespace reader {
@ -57,7 +55,5 @@ private:
}
}
#endif /* USE_SQLITE */
#endif /* INPUT_READERS_POSTGRES_H */

6
src/logging/Manager.cc
View file

@ -26,9 +26,7 @@
#include "writers/DataSeries.h"
#endif
#ifdef USE_SQLITE
#include "writers/SQLite.h"
#endif
using namespace logging;
@ -44,6 +42,7 @@ struct WriterDefinition {
WriterDefinition log_writers[] = {
{ BifEnum::Log::WRITER_NONE, "None", 0, writer::None::Instantiate },
{ BifEnum::Log::WRITER_ASCII, "Ascii", 0, writer::Ascii::Instantiate },
{ BifEnum::Log::WRITER_SQLITE, "SQLite", 0, writer::SQLite::Instantiate },
#ifdef USE_ELASTICSEARCH
{ BifEnum::Log::WRITER_ELASTICSEARCH, "ElasticSearch", 0, writer::ElasticSearch::Instantiate },
@ -52,9 +51,6 @@ WriterDefinition log_writers[] = {
#ifdef USE_DATASERIES
{ BifEnum::Log::WRITER_DATASERIES, "DataSeries", 0, writer::DataSeries::Instantiate },
#endif
#ifdef USE_SQLITE
{ BifEnum::Log::WRITER_SQLITE, "SQLite", 0, writer::SQLite::Instantiate },
#endif
// End marker, don't touch.
{ BifEnum::Log::WRITER_DEFAULT, "None", 0, (WriterBackend* (*)(WriterFrontend* frontend))0 }

4
src/logging/writers/SQLite.cc
View file

@ -2,8 +2,6 @@
#include "config.h"
#ifdef USE_SQLITE
#include <string>
#include <errno.h>
#include <vector>
@ -388,5 +386,3 @@ bool SQLite::DoRotate(const char* rotated_path, double open, double close, bool
return true;
}
#endif /* USE_SQLITE */

5
src/logging/writers/SQLite.h
View file

@ -8,10 +8,9 @@
#include "config.h"
#ifdef USE_SQLITE
#include "../WriterBackend.h"
#include "sqlite3.h"
#include "../../external/sqlite3.h"
#include "../../threading/AsciiFormatter.h"
namespace logging { namespace writer {
@ -59,7 +58,5 @@ private:
}
}
#endif /* USE_SQLITE */
#endif /* LOGGING_WRITER_SQLITE_H */