<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository mpbot-github.
</pre>
<p><a href="https://github.com/macports/mpbot-github/commit/6710b2dffb85d679c03ee6babcec15461f558c55">https://github.com/macports/mpbot-github/commit/6710b2dffb85d679c03ee6babcec15461f558c55</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6710b2d Retry fetching Travis CI logs
</span>6710b2d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6710b2dffb85d679c03ee6babcec15461f558c55
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Sat Jan 5 17:29:37 2019 +0000
<span style='display:block; white-space:pre;color:#404040;'> Retry fetching Travis CI logs
</span>---
ci/logger/remoteLog.go | 2 +-
pr/webhook/server.go | 3 +++
pr/webhook/travis.go | 6 +++---
3 files changed, 7 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ci/logger/remoteLog.go b/ci/logger/remoteLog.go
</span><span style='display:block; white-space:pre;color:#808080;'>index 5dd6ddf..05d6b5f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ci/logger/remoteLog.go
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ci/logger/remoteLog.go
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ import (
</span> "net/url"
"os"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "github.com/hashicorp/go-retryablehttp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ retryablehttp "github.com/hashicorp/go-retryablehttp"
</span> )
var pasteURL = &url.URL{
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/pr/webhook/server.go b/pr/webhook/server.go
</span><span style='display:block; white-space:pre;color:#808080;'>index 39fa666..65941e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/pr/webhook/server.go
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/pr/webhook/server.go
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,6 +18,7 @@ import (
</span> "sync"
"time"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ retryablehttp "github.com/hashicorp/go-retryablehttp"
</span> "github.com/macports/mpbot-github/pr/db"
"github.com/macports/mpbot-github/pr/githubapi"
)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,6 +28,7 @@ type Receiver struct {
</span> hookSecret []byte
production bool
testing bool
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ httpClient *retryablehttp.Client
</span> githubClient githubapi.Client
dbHelper db.DBHelper
wg sync.WaitGroup
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,6 +43,7 @@ func NewReceiver(listenAddr string, hookSecret []byte, botSecret string, product
</span> server: &http.Server{Addr: listenAddr},
hookSecret: hookSecret,
production: production,
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ httpClient: retryablehttp.NewClient(),
</span> githubClient: githubapi.NewClient(botSecret),
dbHelper: dbHelper,
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/pr/webhook/travis.go b/pr/webhook/travis.go
</span><span style='display:block; white-space:pre;color:#808080;'>index 0d10198..bc1d744 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/pr/webhook/travis.go
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/pr/webhook/travis.go
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,11 +6,11 @@ import (
</span> "io/ioutil"
"log"
"mime/multipart"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "net/http"
</span> "regexp"
"strconv"
"strings"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ retryablehttp "github.com/hashicorp/go-retryablehttp"
</span> "github.com/macports/mpbot-github/ci/logger/constants"
)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +77,7 @@ func (receiver *Receiver) handleTravisWebhook(payload TravisWebhookPayload) {
</span> log.Println("Processing " + strconv.Itoa(len(payload.Matrix)) + " job(s)")
for _, job := range payload.Matrix {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- req, err := http.NewRequest(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ req, err := retryablehttp.NewRequest(
</span> "GET",
"https://api.travis-ci.org/job/"+strconv.Itoa(job.ID)+"/log",
nil,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,7 +91,7 @@ func (receiver *Receiver) handleTravisWebhook(payload TravisWebhookPayload) {
</span>
log.Println("Fetching logs for job #" + strconv.Itoa(job.ID))
<span style='display:block; white-space:pre;background:#ffe0e0;'>- resp, err := http.DefaultClient.Do(req)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ resp, err := receiver.httpClient.Do(req)
</span> if err != nil {
continue
}
</pre><pre style='margin:0'>
</pre>