From 8fe4eace598997c3ff4c74aa04f723e8ea444239 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Sun, 16 Jul 2017 19:52:23 +0200 Subject: Better error messages --- common/storage_lmdb.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'common') diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp index f7999d1..9fb2feb 100644 --- a/common/storage_lmdb.cpp +++ b/common/storage_lmdb.cpp @@ -406,7 +406,7 @@ int DataStore::NamedDatabase::scan(const QByteArray &k, const std::functionname.toLatin1() + d->db, getErrorCode(rc), QByteArray("Key: ") + k + " : " + QByteArray(mdb_strerror(rc))); + Error error(d->name.toLatin1() + d->db, getErrorCode(rc), QByteArray("Error during scan. Key: ") + k + " : " + QByteArray(mdb_strerror(rc))); errorHandler ? errorHandler(error) : d->defaultErrorHandler(error); } @@ -420,6 +420,11 @@ void DataStore::NamedDatabase::findLatest(const QByteArray &k, const std::functi // Not an error. We rely on this to read nothing from non-existing databases. return; } + if (k.isEmpty()) { + Error error(d->name.toLatin1() + d->db, GenericError, QByteArray("Can't use findLatest with empty key.")); + errorHandler ? errorHandler(error) : d->defaultErrorHandler(error); + return; + } int rc; MDB_val key; @@ -471,10 +476,10 @@ void DataStore::NamedDatabase::findLatest(const QByteArray &k, const std::functi mdb_cursor_close(cursor); if (rc) { - Error error(d->name.toLatin1(), getErrorCode(rc), QByteArray("Key: ") + k + " : " + QByteArray(mdb_strerror(rc))); + Error error(d->name.toLatin1(), getErrorCode(rc), QByteArray("Error during find latest. Key: ") + k + " : " + QByteArray(mdb_strerror(rc))); errorHandler ? errorHandler(error) : d->defaultErrorHandler(error); } else if (!foundValue) { - Error error(d->name.toLatin1(), 1, QByteArray("Key: ") + k + " : No value found"); + Error error(d->name.toLatin1(), 1, QByteArray("Error during find latest. Key: ") + k + " : No value found"); errorHandler ? errorHandler(error) : d->defaultErrorHandler(error); } -- cgit v1.2.3