Merge branch 'feature/akonadish_log_control' into develop

1 files changed, 14 insertions, 0 deletions

diff --git a/akonadish/state.cpp b/akonadish/state.cpp
index 85cbe10..9fb5bcc 100644
--- a/akonadish/state.cpp
+++ b/akonadish/state.cpp
@@ -24,6 +24,8 @@
 #include <QEventLoop>
 #include <QTextStream>
 
+#include "common/log.h"
+
 static bool s_hasEventLoop = false;
 
 class State::Private
@@ -127,4 +129,16 @@ bool State::commandTiming() const
     return d->timing;
 }
 
+void State::setLoggingLevel(const QString &level) const
+{
+    Akonadi2::Log::setDebugOutputLevel(Akonadi2::Log::debugLevelFromName(level.toLatin1()));
+}
+
+QString State::loggingLevel() const
+{
+    // do not turn this into a single line return: that core dumps due to allocation of
+    // the byte array in Akonadi2::Log
+    QByteArray rv = Akonadi2::Log::debugLevelName(Akonadi2::Log::debugOutputLevel());
+    return rv.toLower();
+}