MXS-2057 Add log output for system test, and two random code fixes

nikonovak · Nov 14, 2018 · e371964 · e371964
1 parent a84748e
commit e371964
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/maxscale-system-test/testconnections.cpp b/maxscale-system-test/testconnections.cpp
@@ -1255,6 +1255,7 @@ static int read_log(const char* name, char** err_log_content_p)
             err_log_content[size] = '\0';
             // printf("s=%ld\n", strlen(err_log_content));
             * err_log_content_p = err_log_content;
+            fclose(f);
             return 0;
         }
         else

diff --git a/maxutils/maxbase/include/maxbase/stopwatch.hh b/maxutils/maxbase/include/maxbase/stopwatch.hh
@@ -49,7 +49,7 @@ struct Duration : public Clock::duration
     }
 
     /** To seconds */
-    double secs()
+    double secs() const
     {
         return std::chrono::duration<double>(*this).count();
     }

diff --git a/server/core/routingworker.cc b/server/core/routingworker.cc
@@ -1020,6 +1020,7 @@ void RoutingWorker::check_systemd_watchdog()
             {
                 s_watchdog_next_check = now + s_watchdog_interval;
 #ifdef HAVE_SYSTEMD
+                MXS_DEBUG("systemd watchdog keep-alive ping: sd_notify(false, \"WATCHDOG=1\")");
                 sd_notify(false, "WATCHDOG=1");
 #endif
                 std::for_each(this_unit.ppWorkers, this_unit.ppWorkers + this_unit.nWorkers,