Merge branch '2.3' into 2.4

system-test/fwf_logging.cpp

@@ -0,0 +1,58 @@
+/**
+ * Firewall filter logging test
+ *
+ * Check if the log_match and log_no_match parameters work
+ */
+
+
+#include <iostream>
+#include <unistd.h>
+#include <maxtest/testconnections.hh>
+#include <maxtest/fw_copy_rules.hh>
+
+int main(int argc, char** argv)
+{
+    TestConnections::skip_maxscale_start(true);
+    char rules_dir[4096];
+
+    TestConnections* test = new TestConnections(argc, argv);
+    test->stop_timeout();
+
+    sprintf(rules_dir, "%s/fw/", test_dir);
+
+    test->tprintf("Creating rules\n");
+    test->maxscales->stop_maxscale(0);
+    copy_rules(test, (char*) "rules_logging", rules_dir);
+
+    test->maxscales->start_maxscale(0);
+    test->set_timeout(20);
+    test->maxscales->connect_maxscale(0);
+
+    test->tprintf("trying first: 'select 1'\n");
+    test->set_timeout(20);
+    test->add_result(execute_query_silent(test->maxscales->conn_slave[0], "select 1"),
+                     "First query should succeed\n");
+
+    test->tprintf("trying second: 'select 2'\n");
+    test->set_timeout(20);
+    test->add_result(execute_query_silent(test->maxscales->conn_slave[0], "select 2"),
+                     "Second query should succeed\n");
+
+    /** Check that MaxScale is alive */
+    test->stop_timeout();
+    test->check_maxscale_processes(0, 1);
+
+    /** Check that MaxScale was terminated successfully */
+    test->maxscales->stop_maxscale(0);
+    sleep(10);
+    test->check_maxscale_processes(0, 0);
+
+    /** Check that the logs contains entries for both matching and
+     * non-matching queries */
+    test->log_includes(0, "matched by");
+    test->log_includes(0, "was not matched");
+
+    int rval = test->global_result;
+    delete test;
+    return rval;
+}