From 394edc67a0bc5a9a0ede6c8a71f7844c87a620b1 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 23 Jan 2016 02:18:56 +0100 Subject: [PATCH] refs #576, logging * log category * fixed join for status message --- src/blackmisc/logcategory.h | 8 ++++++++ src/blackmisc/logpattern.cpp | 1 + src/blackmisc/statusmessagelist.cpp | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/blackmisc/logcategory.h b/src/blackmisc/logcategory.h index 4be50420f..09e45b68b 100644 --- a/src/blackmisc/logcategory.h +++ b/src/blackmisc/logcategory.h @@ -85,6 +85,13 @@ namespace BlackMisc return cat; } + //! Mapping + static const CLogCategory &mapping() + { + static const CLogCategory cat { "swift.mapping" }; + return cat; + } + //! Webservice with swift DB static const CLogCategory &swiftDbWebservice() { @@ -105,6 +112,7 @@ namespace BlackMisc guiComponent(), download(), webservice(), + mapping(), swiftDbWebservice(), }; return cats; diff --git a/src/blackmisc/logpattern.cpp b/src/blackmisc/logpattern.cpp index 1efd74745..1a41b3fd4 100644 --- a/src/blackmisc/logpattern.cpp +++ b/src/blackmisc/logpattern.cpp @@ -19,6 +19,7 @@ namespace BlackMisc { "uncategorized (swift)", exactMatch(CLogCategory::uncategorized()) }, { "validation", exactMatch(CLogCategory::validation()) }, { "verification", exactMatch(CLogCategory::verification()) }, + { "model mapping", exactMatch(CLogCategory::mapping()) }, { "swift contexts", exactMatch(CLogCategory::context()) }, { "swift context slots", exactMatch(CLogCategory::contextSlot()) }, { "swift GUI", exactMatch(CLogCategory::guiComponent()) }, diff --git a/src/blackmisc/statusmessagelist.cpp b/src/blackmisc/statusmessagelist.cpp index d18e9076e..4229dd61f 100644 --- a/src/blackmisc/statusmessagelist.cpp +++ b/src/blackmisc/statusmessagelist.cpp @@ -115,7 +115,7 @@ namespace BlackMisc newMsgs.append(msg.getMessage()); CStatusMessage::StatusSeverity ms = msg.getSeverity(); if (s < ms) { s = ms; } - cats.join(msg.getCategories()); + cats = cats.join(msg.getCategories()); } const CStatusMessage newMsg(cats, s, newMsgs.join(", ")); return newMsg;