From bab02966e03876106d6ca38e5fc8029a81bfb904 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 28 Jun 2019 11:08:19 +0200
Subject: lib/load-configuration, bin/slave-build-connect: skip logging of all
 commands called by slave-build-connect -- they are already logged (with more
 information) in ssh_log

---
 lib/load-configuration | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/load-configuration')

diff --git a/lib/load-configuration b/lib/load-configuration
index 91a6db0..cdea48d 100755
--- a/lib/load-configuration
+++ b/lib/load-configuration
@@ -203,8 +203,8 @@ if ${i_am_the_master}; then
   command="${0##*/}"
   # these commands are useless to log
   if [ "${command}" != 'ii-answer' ] && \
-    [ "${command}" != 'ping-from-slave' ] && \
-    [ "${command}" != 'slave-build-connect' ]; then
+    [ "${command}" != 'slave-build-connect' ] && \
+    [ "${SKIP_COMMAND_LOG}" != 1 ]; then
     # shellcheck disable=SC2016
     {
       printf 'INSERT INTO `command_log`(`command`,`parameters`,`shell`)'
@@ -228,4 +228,5 @@ if ${i_am_the_master}; then
     } | \
       mysql_run_query 'unimportant'
   fi
+  export SKIP_COMMAND_LOG=''
 fi
-- 
cgit v1.2.3