From 631f801aa658ed0fa07df5025b067e20f4db4749 Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Sat, 3 Sep 2022 15:59:44 +0800 Subject: [PATCH] chore(gRPC): fetch new stage data. Signed-off-by: Bo-Yi.Wu --- client/http.go | 2 +- poller/poller.go | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/client/http.go b/client/http.go index 953ad83..0bc1bd2 100644 --- a/client/http.go +++ b/client/http.go @@ -31,7 +31,7 @@ func New(endpoint, secret string, skipverify bool, opts ...Option) *HTTPClient { } client.Client = &http.Client{ - Timeout: 5 * time.Second, + Timeout: 1 * time.Minute, CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }, diff --git a/poller/poller.go b/poller/poller.go index fede31e..15f5b2d 100644 --- a/poller/poller.go +++ b/poller/poller.go @@ -53,7 +53,8 @@ func (p *Poller) Poll(ctx context.Context, n int) error { return } if err := p.poll(ctx, i+1); err != nil { - log.WithError(err).Error("poll error") + log.WithField("thread", i+1). + WithError(err).Error("poll error") } } } @@ -65,10 +66,11 @@ func (p *Poller) Poll(ctx context.Context, n int) error { } func (p *Poller) poll(ctx context.Context, thread int) error { - log.WithField("thread", thread).Info("poller: request stage from remote server") + logger := log.WithField("thread", thread) + logger.Info("poller: request stage from remote server") - // TODO: fetch the job from remote server - time.Sleep(time.Second) + ctx, cancel := context.WithTimeout(ctx, 30*time.Second) + defer cancel() // request a new build stage for execution from the central // build server. @@ -79,11 +81,10 @@ func (p *Poller) poll(ctx context.Context, thread int) error { Type: p.Filter.Type, }) if err == context.Canceled || err == context.DeadlineExceeded { - log.WithError(err).Trace("poller: no stage returned") + logger.WithError(err).Trace("poller: no stage returned") return nil } if err != nil { - log.WithError(err).Error("poller: cannot request stage") return err }