diff --git a/src/logging/writers/SQLite.cc b/src/logging/writers/SQLite.cc index ddee536e76..9c78636867 100644 --- a/src/logging/writers/SQLite.cc +++ b/src/logging/writers/SQLite.cc @@ -112,12 +112,13 @@ bool SQLite::DoInit(const WriterInfo& info, int num_fields, const Field* const * fields) { - string fullpath = info.path+ ".sqlite"; + string fullpath(info.path); + fullpath.append(".sqlite"); string dbname; - map::const_iterator it = info.config.find("dbname"); + map::const_iterator it = info.config.find("dbname"); if ( it == info.config.end() ) { - MsgThread::Info(Fmt("dbname configuration option not found. Defaulting to path %s", info.path.c_str())); + MsgThread::Info(Fmt("dbname configuration option not found. Defaulting to path %s", info.path)); dbname = info.path; } else { dbname = it->second; @@ -211,16 +212,6 @@ bool SQLite::DoInit(const WriterInfo& info, int num_fields, return true; } -bool SQLite::DoFlush() - { - return true; - } - -bool SQLite::DoFinish() - { - return true; - } - // Format String char* SQLite::FS(const char* format, ...) { char * buf; @@ -290,8 +281,8 @@ void SQLite::ValToAscii(ODesc* desc, Value* val) case TYPE_FILE: case TYPE_FUNC: { - int size = val->val.string_val->size(); - const char* data = val->val.string_val->data(); + int size = val->val.string_val.length; + const char* data = val->val.string_val.data; if ( size ) desc->AddN(data, size); @@ -358,10 +349,10 @@ int SQLite::AddParams(Value* val, int pos) case TYPE_FILE: case TYPE_FUNC: { - if ( ! val->val.string_val->size() || val->val.string_val->size() == 0 ) + if ( ! val->val.string_val.length || val->val.string_val.length == 0 ) return sqlite3_bind_null(st, pos); - return sqlite3_bind_text(st, pos, val->val.string_val->data(), val->val.string_val->size(), SQLITE_TRANSIENT); // FIXME who deletes this + return sqlite3_bind_text(st, pos, val->val.string_val.data, val->val.string_val.length, SQLITE_TRANSIENT); // FIXME who deletes this } case TYPE_TABLE: @@ -433,15 +424,4 @@ bool SQLite::DoWrite(int num_fields, const Field* const * fields, Value** vals) return true; } -bool SQLite::DoRotate(string rotated_path, double open, double close, bool terminating) - { - return true; - } - -bool SQLite::DoSetBuf(bool enabled) - { - // Nothing to do. - return true; - } - #endif /* USE_SQLITE */ diff --git a/src/logging/writers/SQLite.h b/src/logging/writers/SQLite.h index d4bb50a7a1..8a3baaec9e 100644 --- a/src/logging/writers/SQLite.h +++ b/src/logging/writers/SQLite.h @@ -27,11 +27,12 @@ protected: const threading::Field* const* fields); virtual bool DoWrite(int num_fields, const threading::Field* const* fields, threading::Value** vals); - virtual bool DoSetBuf(bool enabled); - virtual bool DoRotate(string rotated_path, double open, - double close, bool terminating); - virtual bool DoFlush(); - virtual bool DoFinish(); + virtual bool DoSetBuf(bool enabled) { return true; } + virtual bool DoRotate(const char* rotated_path, double open, + double close, bool terminating) { return true; } + virtual bool DoFlush(double network_time) { return true; } + virtual bool DoFinish(double network_time) { return true; } + virtual bool DoHeartbeat(double network_time, double current_time) { return true; } private: bool checkError(int code);