From 3dcb3e9073d825a4ada184f832892cf4bd5836a3 Mon Sep 17 00:00:00 2001 From: zeripath Date: Wed, 14 Jul 2021 15:43:13 +0100 Subject: Second attempt at preventing zombies (#16326) * Second attempt at preventing zombies * Ensure that the pipes are closed in ssh.go * Ensure that a cancellable context is passed up in cmd/* http requests * Make cmd.fail return properly so defers are obeyed * Ensure that something is sent to stdout in case of blocks here Signed-off-by: Andrew Thornton * placate lint Signed-off-by: Andrew Thornton * placate lint 2 Signed-off-by: Andrew Thornton * placate lint 3 Signed-off-by: Andrew Thornton * fixup Signed-off-by: Andrew Thornton * Apply suggestions from code review Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: Lauris BH --- integrations/mssql.ini.tmpl | 1 + integrations/mysql.ini.tmpl | 1 + integrations/mysql8.ini.tmpl | 1 + integrations/pgsql.ini.tmpl | 1 + integrations/sqlite.ini.tmpl | 1 + 5 files changed, 5 insertions(+) (limited to 'integrations') diff --git a/integrations/mssql.ini.tmpl b/integrations/mssql.ini.tmpl index 1867070ff5..0a7710fc5f 100644 --- a/integrations/mssql.ini.tmpl +++ b/integrations/mssql.ini.tmpl @@ -83,6 +83,7 @@ MODE = test,file ROOT_PATH = mssql-log ROUTER = , XORM = file +ENABLE_SSH_LOG = true [log.test] LEVEL = Info diff --git a/integrations/mysql.ini.tmpl b/integrations/mysql.ini.tmpl index 176992cb26..a78b0425a1 100644 --- a/integrations/mysql.ini.tmpl +++ b/integrations/mysql.ini.tmpl @@ -101,6 +101,7 @@ MODE = test,file ROOT_PATH = mysql-log ROUTER = , XORM = file +ENABLE_SSH_LOG = true [log.test] LEVEL = Info diff --git a/integrations/mysql8.ini.tmpl b/integrations/mysql8.ini.tmpl index 7c5bcb58dc..1151b6abc2 100644 --- a/integrations/mysql8.ini.tmpl +++ b/integrations/mysql8.ini.tmpl @@ -80,6 +80,7 @@ MODE = test,file ROOT_PATH = mysql8-log ROUTER = , XORM = file +ENABLE_SSH_LOG = true [log.test] LEVEL = Info diff --git a/integrations/pgsql.ini.tmpl b/integrations/pgsql.ini.tmpl index 3a4a5e6c4f..f11d4faba5 100644 --- a/integrations/pgsql.ini.tmpl +++ b/integrations/pgsql.ini.tmpl @@ -84,6 +84,7 @@ MODE = test,file ROOT_PATH = pgsql-log ROUTER = , XORM = file +ENABLE_SSH_LOG = true [log.test] LEVEL = Info diff --git a/integrations/sqlite.ini.tmpl b/integrations/sqlite.ini.tmpl index 4a796e9317..71ac39a44b 100644 --- a/integrations/sqlite.ini.tmpl +++ b/integrations/sqlite.ini.tmpl @@ -79,6 +79,7 @@ MODE = test,file ROOT_PATH = sqlite-log ROUTER = , XORM = file +ENABLE_SSH_LOG = true [log.test] LEVEL = Info -- cgit v1.2.3