hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.1' into 2.2

Browse Source
This commit is contained in:
Johan Wikman 2018-02-08 18:39:45 +02:00
commit 5a33a5a013
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/Filters/Query-Log-All-Filter.md
View File

@ -16,7 +16,7 @@ module=qlafilter
[MyService]
type=service
router=readconnrouter
router=readconnroute
servers=server1
user=myuser
passwd=mypasswd

3
maxscale-system-test/local_address.cpp
View File

@ -73,8 +73,9 @@ string extract_ip(string s)
void get_maxscale_ips(TestConnections& test, vector<string>* pIps)
{
static const char COMMAND[] = "export PATH=$PATH:/sbin:/usr/sbin; ip addr|fgrep inet|fgrep -v ::";
int exit_code;
string output(test.maxscales->ssh_node_output(0, "ip addr|fgrep inet|fgrep -v ::", false, &exit_code));
string output(test.maxscales->ssh_node_output(0, COMMAND, false, &exit_code));
to_collection(output, "\n", pIps);
transform(pIps->begin(), pIps->end(), pIps->begin(), extract_ip);