From 5f4c723fef475a105c7f79b966431e222541649b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Wed, 7 Feb 2018 09:20:22 +0200 Subject: [PATCH 1/2] Fix typo in QLAfilter documentation The readconnroute module name was written as readconnrouter, with an extra `r` at the end. --- Documentation/Filters/Query-Log-All-Filter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/Filters/Query-Log-All-Filter.md b/Documentation/Filters/Query-Log-All-Filter.md index 39ebdf401..94cd90c1d 100644 --- a/Documentation/Filters/Query-Log-All-Filter.md +++ b/Documentation/Filters/Query-Log-All-Filter.md @@ -14,7 +14,7 @@ module=qlafilter [MyService] type=service -router=readconnrouter +router=readconnroute servers=server1 user=myuser passwd=mypasswd From 716f39bc8b03ceac21cf9ab17f86daab725230e6 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Thu, 8 Feb 2018 18:22:01 +0200 Subject: [PATCH 2/2] local_address: Add directories to path --- maxscale-system-test/local_address.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/maxscale-system-test/local_address.cpp b/maxscale-system-test/local_address.cpp index 3795f78b0..ec6ee594d 100644 --- a/maxscale-system-test/local_address.cpp +++ b/maxscale-system-test/local_address.cpp @@ -73,7 +73,9 @@ string extract_ip(string s) void get_maxscale_ips(TestConnections& test, vector* pIps) { - string output(test.ssh_maxscale_output(false, "ip addr|fgrep inet|fgrep -v ::")); + static const char COMMAND[] = "export PATH=$PATH:/sbin:/usr/sbin; ip addr|fgrep inet|fgrep -v ::"; + + string output(test.ssh_maxscale_output(false, COMMAND)); to_collection(output, "\n", pIps); transform(pIps->begin(), pIps->end(), pIps->begin(), extract_ip);