<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch develop
in repository mpbot-github.
</pre>
<p><a href="https://github.com/macports/mpbot-github/commit/dc7089445662f733c9dc9365fd1e48a15a8acf10">https://github.com/macports/mpbot-github/commit/dc7089445662f733c9dc9365fd1e48a15a8acf10</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/develop by this push:
<span style='display:block; white-space:pre;color:#404040;'> new dc70894 ci: use retryable HTTP client
</span>dc70894 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit dc7089445662f733c9dc9365fd1e48a15a8acf10
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Sun May 13 02:13:16 2018 +0000
<span style='display:block; white-space:pre;color:#404040;'> ci: use retryable HTTP client
</span>---
ci/logger/remoteLog.go | 14 ++++++--------
1 file changed, 6 insertions(+), 8 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 8b360d6..b371abe 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;'>@@ -4,9 +4,10 @@ import (
</span> "bytes"
"io"
"mime/multipart"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "net/http"
</span> "net/url"
"os"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "github.com/hashicorp/go-retryablehttp"
</span> )
var pasteURL = &url.URL{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +20,7 @@ type remoteLogger struct {
</span> logBigFileChan chan *LogFile
parent *Logger
quitChan chan byte
<span style='display:block; white-space:pre;background:#ffe0e0;'>- httpClient *http.Client
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ httpClient *retryablehttp.Client
</span> }
func newRemoteLogger(parent *Logger) *remoteLogger {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,11 +28,7 @@ func newRemoteLogger(parent *Logger) *remoteLogger {
</span> logBigFileChan: make(chan *LogFile, 4),
parent: parent,
quitChan: make(chan byte),
<span style='display:block; white-space:pre;background:#ffe0e0;'>- httpClient: &http.Client{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CheckRedirect: func(req *http.Request, via []*http.Request) error {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return http.ErrUseLastResponse
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ httpClient: retryablehttp.NewClient(),
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +64,8 @@ func (r *remoteLogger) run() {
</span> io.Copy(writer, file)
file.Close()
mimeWriter.Close()
<span style='display:block; white-space:pre;background:#ffe0e0;'>- resp, iErr := r.httpClient.Post(pasteURL.String(), mimeWriter.FormDataContentType(), buf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ postForm := bytes.NewReader(buf.Bytes())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ resp, iErr := r.httpClient.Post(pasteURL.String(), mimeWriter.FormDataContentType(), postForm)
</span> if iErr != nil {
err = iErr
continue
</pre><pre style='margin:0'>
</pre>