Skip to content

Commit ebf0c92

Browse files
committed
v1.3.5: avoid logging an error when the background process is killed at
the end of the session
1 parent 62aeed3 commit ebf0c92

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SSHPROXY_VERSION ?= 1.3.3
1+
SSHPROXY_VERSION ?= 1.3.5
22
SSHPROXY_GIT_URL ?= github.com/cea-hpc/sshproxy
33

44
prefix ?= /usr

cmd/sshproxy/sshproxy.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,12 @@ func mainExitCode() int {
391391
defer wg.Done()
392392
cmd := prepareBackgroundCommand(ctx, config.BgCommand, config.Debug)
393393
if _, err := runCommand(cmd, false); err != nil {
394-
log.Errorf("error running background command: %s", err)
394+
select {
395+
case <-ctx.Done():
396+
// stay silent as the session is now finished
397+
default:
398+
log.Errorf("error running background command: %s", err)
399+
}
395400
}
396401
}()
397402
}

misc/sshproxy.spec

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
%global debug_package %{nil}
44

55
Name: sshproxy
6-
Version: 1.3.3
6+
Version: 1.3.5
77
Release: 1%{?dist}
88
Summary: SSH proxy
99
License: CeCILL-B
@@ -51,6 +51,12 @@ install -p -m 0644 config/sshproxy.yaml %{buildroot}%{_sysconfdir}/sshproxy
5151
%{_mandir}/man8/sshproxy-replay.8*
5252

5353
%changelog
54+
* Tue Feb 02 2021 Cyril Servant <[email protected]> - 1.3.5-1
55+
- sshproxy 1.3.5
56+
57+
* Tue Feb 02 2021 Cyril Servant <[email protected]> - 1.3.4-1
58+
- sshproxy 1.3.4
59+
5460
* Fri Oct 02 2020 Cyril Servant <[email protected]> - 1.3.3-1
5561
- sshproxy 1.3.3
5662

0 commit comments

Comments
 (0)