TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-08-12 14:47:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove SuspendSignalHandler

Browse Source
This commit is contained in:
Alexander Neumann
2018-01-17 23:14:47 +01:00
parent c31a5e7e5c
commit 0bdb131521
5 changed files with 11 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/backend/sftp/layout_test.go
View File

@@ -46,7 +46,7 @@ func TestLayout(t *testing.T) {
Command: fmt.Sprintf("%q -e", sftpServer),
Path: repo,
Layout: test.layout,
}, nil, nil)
})
if err != nil {
t.Fatal(err)
}

20
internal/backend/sftp/sftp.go
View File

@@ -36,7 +36,7 @@ var _ restic.Backend = &SFTP{}
const defaultLayout = "default"
func startClient(preExec, postExec func(), program string, args ...string) (*SFTP, error) {
func startClient(program string, args ...string) (*SFTP, error) {
debug.Log("start client %v %v", program, args)
// Connect to a remote host and request the sftp subsystem via the 'ssh'
// command. This assumes that passwordless login is correctly configured.
@@ -65,19 +65,11 @@ func startClient(preExec, postExec func(), program string, args ...string) (*SFT
return nil, errors.Wrap(err, "cmd.StdoutPipe")
}
if preExec != nil {
preExec()
}
bg, err := startForeground(cmd)
if err != nil {
return nil, errors.Wrap(err, "cmd.Start")
}
if postExec != nil {
postExec()
}
// wait in a different goroutine
ch := make(chan error, 1)
go func() {
@@ -116,7 +108,7 @@ func (r *SFTP) clientError() error {
// Open opens an sftp backend as described by the config by running
// "ssh" with the appropriate arguments (or cfg.Command, if set). The function
// preExec is run just before, postExec just after starting a program.
func Open(cfg Config, preExec, postExec func()) (*SFTP, error) {
func Open(cfg Config) (*SFTP, error) {
debug.Log("open backend with config %#v", cfg)
cmd, args, err := buildSSHCommand(cfg)
@@ -124,7 +116,7 @@ func Open(cfg Config, preExec, postExec func()) (*SFTP, error) {
return nil, err
}
sftp, err := startClient(preExec, postExec, cmd, args...)
sftp, err := startClient(cmd, args...)
if err != nil {
debug.Log("unable to start program: %v", err)
return nil, err
@@ -209,13 +201,13 @@ func buildSSHCommand(cfg Config) (cmd string, args []string, err error) {
// Create creates an sftp backend as described by the config by running "ssh"
// with the appropriate arguments (or cfg.Command, if set). The function
// preExec is run just before, postExec just after starting a program.
func Create(cfg Config, preExec, postExec func()) (*SFTP, error) {
func Create(cfg Config) (*SFTP, error) {
cmd, args, err := buildSSHCommand(cfg)
if err != nil {
return nil, err
}
sftp, err := startClient(preExec, postExec, cmd, args...)
sftp, err := startClient(cmd, args...)
if err != nil {
debug.Log("unable to start program: %v", err)
return nil, err
@@ -243,7 +235,7 @@ func Create(cfg Config, preExec, postExec func()) (*SFTP, error) {
}
// open backend
return Open(cfg, preExec, postExec)
return Open(cfg)
}
// Location returns this backend's location (the directory name).

4
internal/backend/sftp/sftp_test.go
View File

@@ -50,13 +50,13 @@ func newTestSuite(t testing.TB) *test.Suite {
// CreateFn is a function that creates a temporary repository for the tests.
Create: func(config interface{}) (restic.Backend, error) {
cfg := config.(sftp.Config)
return sftp.Create(cfg, nil, nil)
return sftp.Create(cfg)
},
// OpenFn is a function that opens a previously created temporary repository.
Open: func(config interface{}) (restic.Backend, error) {
cfg := config.(sftp.Config)
return sftp.Open(cfg, nil, nil)
return sftp.Open(cfg)
},
// CleanupFn removes data created during the tests.