Merge branch '2.2' into develop

2018-04-24 11:02:02 +03:00
parent 8f87f0fc6f e81dd4ab24
commit a7df6b55d5
6 changed files with 57 additions and 5 deletions
--- a/server/core/log_manager.cc
+++ b/server/core/log_manager.cc
@ -896,11 +896,12 @@ static int logmanager_write_log(int            priority,
        case LOG_ERR:
        case LOG_WARNING:
        case LOG_NOTICE:
+        case LOG_INFO:
            syslog(priority, "%s", message);
            break;

        default:
-            // LOG_INFO and LOG_DEBUG messages are never written to syslog.
+            // LOG_DEBUG messages are never written to syslog.
            break;
        }
    }