2 files changed, 55 insertions, 2 deletions

diff --git a/sinksh/syntax_modules/core_syntax.cpp b/sinksh/syntax_modules/core_syntax.cpp
index f5b6274..e90d894 100644
--- a/sinksh/syntax_modules/core_syntax.cpp
+++ b/sinksh/syntax_modules/core_syntax.cpp
@@ -25,6 +25,7 @@
 #include "state.h"
 #include "syntaxtree.h"
 #include "utils.h"
+#include "common/log.h"
 
 namespace CoreSyntax
 {
@@ -32,7 +33,6 @@ namespace CoreSyntax
 bool exit(const QStringList &, State &)
 {
     ::exit(0);
-    return true;
 }
 
 bool showHelp(const QStringList &commands, State &state)
@@ -164,6 +164,49 @@ bool printLoggingLevel(const QStringList &commands, State &state)
     return true;
 }
 
+bool setLoggingAreas(const QStringList &commands, State &state)
+{
+    if (commands.isEmpty()) {
+        state.printError(QObject::tr("Wrong number of arguments; expected logging areas."));
+        return false;
+    }
+
+    QByteArrayList areas;
+    for (const auto &c : commands) {
+        areas << c.toLatin1();
+    }
+
+    Sink::Log::setDebugOutputFilter(Sink::Log::Area, areas);
+    return true;
+}
+
+bool setLoggingFilter(const QStringList &commands, State &state)
+{
+    if (commands.isEmpty()) {
+        state.printError(QObject::tr("Wrong number of arguments; expected resource identifier or application names."));
+        return false;
+    }
+
+    QByteArrayList filter;
+    for (const auto &c : commands) {
+        filter << c.toLatin1();
+    }
+
+    Sink::Log::setDebugOutputFilter(Sink::Log::ApplicationName, filter);
+    return true;
+}
+
+bool setLoggingFields(const QStringList &commands, State &state)
+{
+    QByteArrayList output;
+    for (const auto &c : commands) {
+        output << c.toLatin1();
+    }
+
+    Sink::Log::setDebugOutputFields(output);
+    return true;
+}
+
 Syntax::List syntax()
 {
     Syntax::List syntax;
@@ -187,6 +230,16 @@ Syntax::List syntax()
     logging.completer = [](const QStringList &, const QString &fragment, State &state) -> QStringList { return Utils::filteredCompletions(QStringList() << "trace" << "log" << "warning" << "error", fragment, Qt::CaseInsensitive); };
     set.children << logging;
 
+    Syntax loggingAreas("loggingAreas", QObject::tr("Set logging areas."), &CoreSyntax::setLoggingAreas);
+    set.children << loggingAreas;
+
+    Syntax loggingFilter("loggingFilter", QObject::tr("Set logging filter."), &CoreSyntax::setLoggingFilter);
+    set.children << loggingFilter;
+
+    Syntax loggingFields("loggingFields", QObject::tr("Set logging fields."), &CoreSyntax::setLoggingFields);
+    loggingFields.completer = [](const QStringList &, const QString &fragment, State &state) -> QStringList { return Utils::filteredCompletions(QStringList() << "name" << "function" << "location" << "", fragment, Qt::CaseInsensitive); };
+    set.children << loggingFields;
+
     syntax << set;
 
     Syntax get("get", QObject::tr("Gets settings for the session"));
diff --git a/sinksh/syntax_modules/sink_clear.cpp b/sinksh/syntax_modules/sink_clear.cpp
index d02c638..72d9a14 100644
--- a/sinksh/syntax_modules/sink_clear.cpp
+++ b/sinksh/syntax_modules/sink_clear.cpp
@@ -41,7 +41,7 @@ bool clear(const QStringList &args, State &state)
 {
     for (const auto &resource : args) {
         state.print(QObject::tr("Removing local cache for '%1' ...").arg(resource));
-        Sink::Store::removeFromDisk(resource.toLatin1());
+        Sink::Store::removeDataFromDisk(resource.toLatin1()).exec().waitForFinished();
         state.printLine(QObject::tr("done"));
     }