From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sat, 5 Jul 2014 20:14:00 +0000 (+0200)
Subject: Merge pull request #81 from otih/master
X-Git-Tag: 0.11.0~28
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=019ba67419a5d92eb50275311c05002eef0eb11a;hp=7909b6a0a1a1c0090bea437e1af2ea6936263ce9

Merge pull request #81 from otih/master

Fix Bug #1293: --syslog option writes to emergency level
---

diff --git a/src/common/logger.cpp b/src/common/logger.cpp
index 7cb7f4a0..27a3f6d7 100644
--- a/src/common/logger.cpp
+++ b/src/common/logger.cpp
@@ -77,7 +77,7 @@ void Logger::log()
             prio = LOG_INFO;
             break;
         }
-        syslog(LOG_USER & prio, "%s", qPrintable(_buffer));
+        syslog(prio|LOG_USER, "%s", qPrintable(_buffer));
     }
 #endif