[debug] use debug channel for uncond print. Fixes MER#1431

Signed-off-by: Denis Zalevskiy <denis@visfun.org>
sailfishos · Nov 27, 2015 · 06b9d6f · 06b9d6f
1 parent e82b352
commit 06b9d6f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/include/qtaround/debug.hpp b/include/qtaround/debug.hpp
@@ -30,7 +30,7 @@ enum class Level { First_ = 1, Debug = First_, Info, Warning, Error
 /// compatible with syslog priorities
 enum class Priority { First_ = 0, Emerg = First_, Alert, Crit
         , Err, Warning, Notice, Info
-        , Debug, Last_ = Debug };
+        , Debug, Uncond, Last_ = Uncond };
 
 void set_max_priority(Priority);
 Priority get_priority(Level);
@@ -51,6 +51,7 @@ extern template struct Traits<Priority::Err>;
 extern template struct Traits<Priority::Crit>;
 extern template struct Traits<Priority::Alert>;
 extern template struct Traits<Priority::Emerg>;
+extern template struct Traits<Priority::Uncond>;
 
 static inline void print(QDebug &&d)
 {
@@ -74,7 +75,7 @@ void print(QDebug &&d, T &&v1, A&& ...args)
 template <typename ... A>
 void print(A&& ...args)
 {
-    Traits<Priority::Emerg> ctx;
+    Traits<Priority::Uncond> ctx;
     return print(ctx.stream(), std::forward<A>(args)...);
 }
 

diff --git a/src/debug.cpp b/src/debug.cpp
@@ -44,7 +44,7 @@ int get_priority(char const *name)
         {"Err", Priority::Err},
         {"Crit", Priority::Crit},
         {"Alert", Priority::Alert},
-        {"Emerg", Priority::Emerg},
+        {"Emerg", Priority::Emerg}
     };
     auto res = -1;
     if (name) {
@@ -117,6 +117,7 @@ template struct Traits<Priority::Err>;
 template struct Traits<Priority::Crit>;
 template struct Traits<Priority::Alert>;
 template struct Traits<Priority::Emerg>;
+template struct Traits<Priority::Uncond>;
 
 template <>
 QDebug Traits<Priority::Debug>::stream()
@@ -166,6 +167,12 @@ QDebug Traits<Priority::Emerg>::stream()
     return logger.critical();
 }
 
+template <>
+QDebug Traits<Priority::Uncond>::stream()
+{
+    return logger.debug();
+}
+
 void level(Level level)
 {
     set_level(level);