github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(api): fix snapshot hanging

pull/2543/head
Anthony Lapenna 2018-12-12 17:00:15 +13:00
parent 6c26cf1f39
commit 1384359baf
2 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/cron/job_snapshot.go
View File

@ -45,6 +45,7 @@ func (runner *SnapshotJobRunner) GetSchedule() *portainer.Schedule {
// As a snapshot can be a long process, to avoid any concurrency issue we // As a snapshot can be a long process, to avoid any concurrency issue we
// retrieve the latest version of the endpoint right after a snapshot. // retrieve the latest version of the endpoint right after a snapshot.
func (runner *SnapshotJobRunner) Run() { func (runner *SnapshotJobRunner) Run() {
go func() {
endpoints, err := runner.context.endpointService.Endpoints() endpoints, err := runner.context.endpointService.Endpoints()
if err != nil { if err != nil {
log.Printf("background schedule error (endpoint snapshot). Unable to retrieve endpoint list (err=%s)\n", err) log.Printf("background schedule error (endpoint snapshot). Unable to retrieve endpoint list (err=%s)\n", err)
@ -80,4 +81,5 @@ func (runner *SnapshotJobRunner) Run() {
return return
} }
} }
}()
} }

2
api/docker/client.go
View File

@ -3,6 +3,7 @@ package docker
import ( import (
"net/http" "net/http"
"strings" "strings"
"time"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/portainer/portainer" "github.com/portainer/portainer"
@ -102,5 +103,6 @@ func httpClient(endpoint *portainer.Endpoint) (*http.Client, error) {
return &http.Client{ return &http.Client{
Transport: transport, Transport: transport,
Timeout: 30 * time.Second,
}, nil }, nil
} }