Improved log level when DB reading fails

(Mapping between severity and read status flags)
This commit is contained in:
Klaus Basan
2015-10-18 23:26:52 +02:00
committed by Mathew Sutcliffe
parent 3970b96eaf
commit bcf1bed1d0
3 changed files with 43 additions and 15 deletions

View File

@@ -66,24 +66,38 @@ namespace BlackMisc
}
}
CStatusMessage::StatusSeverity CEntityFlags::flagToSeverity(CEntityFlags::ReadState state)
{
switch (state)
{
case ReadFinished:
case StartRead:
default:
return CStatusMessage::SeverityInfo;
case ReadFailed:
return CStatusMessage::SeverityWarning;
}
}
bool CEntityFlags::isWarningOrAbove(CEntityFlags::ReadState state)
{
CStatusMessage::StatusSeverity s = flagToSeverity(state);
switch (s) {
case CStatusMessage::SeverityError:
case CStatusMessage::SeverityWarning:
return true;
default:
return false;
}
}
void CEntityFlags::registerMetadata()
{
// this is no value class and I register enums here,
// that's why I do not use the Mixins
int id = qRegisterMetaType<CEntityFlags::Entity>();
// int idb = qDBusRegisterMetaType<CEntityFlags::Entity>();
// Q_ASSERT_X(id >= 1024 && id == idb, Q_FUNC_INFO, "wrong id for metatype");
Q_ASSERT_X(id >= 1024, Q_FUNC_INFO, "wrong id for metatype");
id = qRegisterMetaType<CEntityFlags::EntityFlag>();
// idb = qDBusRegisterMetaType<CEntityFlags::EntityFlag>();
Q_ASSERT_X(id >= 1024, Q_FUNC_INFO, "wrong id for metatype");
id = qRegisterMetaType<CEntityFlags::ReadState>();
// idb = qDBusRegisterMetaType<CEntityFlags::ReadState>();
Q_ASSERT_X(id >= 1024, Q_FUNC_INFO, "wrong id for metatype");
Q_UNUSED(id);
// Q_UNUSED(idb);
qRegisterMetaType<CEntityFlags::Entity>();
qRegisterMetaType<CEntityFlags::EntityFlag>();
qRegisterMetaType<CEntityFlags::ReadState>();
}
} // namespace
} // namespace

View File

@@ -13,6 +13,7 @@
#define BLACKMISC_NETWORK_ENTITRFLAGS_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/statusmessage.h"
#include <QObject>
namespace BlackMisc
@@ -62,6 +63,12 @@ namespace BlackMisc
//! Convert to string
static QString flagToString(ReadState flag);
//! Flag to severity
static BlackMisc::CStatusMessage::StatusSeverity flagToSeverity(ReadState state);
//! Read state representing warning or above?
static bool isWarningOrAbove(ReadState state);
//! Register metadata
static void registerMetadata();
};