Merge branch '2.3' into 2.4

2020-03-19 15:13:19 +02:00
parent b98b8f9d4a a8e2584bfc
commit 80a8fd55be
4 changed files with 11 additions and 9 deletions
--- a/maxscale-system-test/maxtest/src/testconnections.cpp
+++ b/maxscale-system-test/maxtest/src/testconnections.cpp
@ -577,13 +577,14 @@ TestConnections::~TestConnections()
        // galera->disable_ssl();
    }

+    // stop all Maxscales to detect crashes on exit
+    for (int i = 0; i < maxscales->N; i++)
+    {
+        stop_maxscale(i);
+    }
+
    if (maxscales->use_valgrind)
    {
-        // stop all Maxscales to get proper Valgrind logs
-        for (int i = 0; i < maxscales->N; i++)
-        {
-            stop_maxscale(i);
-        }
        sleep(15);      // sleep to let logs be written do disks
    }