<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/bb29ea01f7aa3a5313b5c39c3082956ac0633607">https://github.com/macports/mpbot-github/commit/bb29ea01f7aa3a5313b5c39c3082956ac0633607</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 bb29ea0 ci: Support custom pastebin
</span>bb29ea0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bb29ea01f7aa3a5313b5c39c3082956ac0633607
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Sat Jan 26 18:18:18 2019 +0000
<span style='display:block; white-space:pre;color:#404040;'> ci: Support custom pastebin
</span>---
ci/logger/remoteLog.go | 23 +++++++++++++++--------
1 file changed, 15 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 05d6b5f..449181c 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,6 +4,7 @@ import (
</span> "bytes"
"errors"
"io"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "log"
</span> "mime/multipart"
"net/http"
"net/url"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,24 +13,30 @@ import (
</span> retryablehttp "github.com/hashicorp/go-retryablehttp"
)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-var pasteURL = &url.URL{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Scheme: "https",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Host: "paste.macports.org",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Path: "/",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> type remoteLogger struct {
logBigFileChan chan *LogFile
parent *Logger
quitChan chan byte
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ pasteURL *url.URL
</span> httpClient *retryablehttp.Client
}
func newRemoteLogger(parent *Logger) *remoteLogger {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ defaultPasteURL, _ := url.Parse("https://paste.macports.org/")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pasteURL := defaultPasteURL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if envPasteURL := os.Getenv("PASTE_URL"); envPasteURL != "" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ var err error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pasteURL, err = url.Parse(envPasteURL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if err != nil {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ log.Println(err)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pasteURL = defaultPasteURL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> r := &remoteLogger{
logBigFileChan: make(chan *LogFile, 4),
parent: parent,
quitChan: make(chan byte),
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ pasteURL: pasteURL,
</span> httpClient: retryablehttp.NewClient(),
}
r.httpClient.Logger = nil
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +85,7 @@ func (r *remoteLogger) run() {
</span> file.Close()
mimeWriter.Close()
postForm := bytes.NewReader(buf.Bytes())
<span style='display:block; white-space:pre;background:#ffe0e0;'>- resp, iErr := r.httpClient.Post(pasteURL.String(), mimeWriter.FormDataContentType(), postForm)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ resp, iErr := r.httpClient.Post(r.pasteURL.String(), mimeWriter.FormDataContentType(), postForm)
</span> if iErr != nil {
err = iErr
break
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +96,7 @@ func (r *remoteLogger) run() {
</span> err = errors.New("missing Location header")
break
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- u, iErr := pasteURL.Parse(loc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ u, iErr := r.pasteURL.Parse(loc)
</span> if iErr != nil {
err = iErr
break
</pre><pre style='margin:0'>
</pre>