Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-08 06:55:28 +02:00
Code Releases Activity

add extra github error handling

Browse source
This commit is contained in:
Elliott Stoneham 2016-06-16 18:43:25 +01:00
parent 4c8f9249d9
commit 936b68850e
1 changed files with 38 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

45
documize/section/github/github.go
View file

@ -85,7 +85,8 @@ func (t *Provider) Command(w http.ResponseWriter, r *http.Request) {
return return
} }
defer r.Body.Close() defer r.Body.Close() // ignore error
body, err := ioutil.ReadAll(r.Body) body, err := ioutil.ReadAll(r.Body)
if err != nil { if err != nil {
@ -309,7 +310,14 @@ func (*Provider) getCommits(client *gogithub.Client, config githubConfig) ([]git
// Refresh ... gets the latest version // Refresh ... gets the latest version
func (t *Provider) Refresh(configJSON, data string) string { func (t *Provider) Refresh(configJSON, data string) string {
var c = githubConfig{} var c = githubConfig{}
json.Unmarshal([]byte(configJSON), &c)
err := json.Unmarshal([]byte(configJSON), &c)
if err != nil {
log.Error("unable to unmarshall github config", err)
return data
}
c.Clean() c.Clean()
refreshed, err := t.getCommits(t.githubClient(c), c) refreshed, err := t.getCommits(t.githubClient(c), c)
@ -335,15 +343,27 @@ type githubRender struct {
CommitCount int CommitCount int
} }
// Render ... just returns the data given // Render ... just returns the data given, suitably formatted
func (*Provider) Render(config, data string) string { func (*Provider) Render(config, data string) string {
var err error
raw := []githubBranchCommits{} raw := []githubBranchCommits{}
payload := githubRender{} payload := githubRender{}
var c = githubConfig{} var c = githubConfig{}
json.Unmarshal([]byte(data), &raw) err = json.Unmarshal([]byte(data), &raw)
json.Unmarshal([]byte(config), &c)
if err != nil {
log.Error("unable to unmarshall github data", err)
return "Documize internal github json umarshall data error: " + err.Error()
}
err = json.Unmarshal([]byte(config), &c)
if err != nil {
log.Error("unable to unmarshall github config", err)
return "Documize internal github json umarshall config error: " + err.Error()
}
c.Clean() c.Clean()
@ -356,7 +376,6 @@ func (*Provider) Render(config, data string) string {
} }
t := template.New("github") t := template.New("github")
var err error
t, err = t.Parse(renderTemplate) t, err = t.Parse(renderTemplate)
@ -403,12 +422,24 @@ func Callback(res http.ResponseWriter, req *http.Request) error {
var gt githubCallbackT var gt githubCallbackT
err = json.NewDecoder(res2.Body).Decode(&gt) err = json.NewDecoder(res2.Body).Decode(&gt)
if err != nil {
return err
}
res2.Body.Close() err = res2.Body.Close()
if err != nil {
return err
}
returl, err := url.QueryUnescape(state) returl, err := url.QueryUnescape(state)
if err != nil {
return err
}
up, err := url.Parse(returl) up, err := url.Parse(returl)
if err != nil {
return err
}
target := up.Scheme + "://" + up.Host + up.Path + "?code=" + gt.AccessToken target := up.Scheme + "://" + up.Host + up.Path + "?code=" + gt.AccessToken