actually make sqlite work again (tests passed because the writer

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

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 }