Merge branch '2.1' into 2.2

2017-10-03 14:30:06 +03:00
parent 27ccf0877c 9280f1a5d7
commit bd39284f9c
39 changed files with 685 additions and 417 deletions
--- a/include/maxscale/log_manager.h
+++ b/include/maxscale/log_manager.h
@ -113,7 +113,7 @@ json_t* mxs_logs_to_json(const char* host);
 static inline bool mxs_log_priority_is_enabled(int priority)
 {
    assert((priority & ~LOG_PRIMASK) == 0);
-    return MXS_LOG_PRIORITY_IS_ENABLED(priority);
+    return MXS_LOG_PRIORITY_IS_ENABLED(priority) || priority == LOG_ALERT;
 }

 int mxs_log_message(int priority,