opensourcemirror
/
git.sr.ht
mirror of https://git.sr.ht/~sircmpwn/git.sr.ht
1
0
Fork 0
Code Issues Releases Wiki Activity

gitsrht-update-hook: fix logger formatting 

- Some Println calls were using format strings
- Some Printf calls were used without a format string
- %e is not valid, use %v instead
This commit is contained in:
Simon Ser 2021-11-04 15:09:06 +00:00 committed by Drew DeVault
parent f5db865a3b
commit 4bddca82e9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gitsrht-update-hook/post-update.go
View File

@ -235,7 +235,7 @@ func postUpdate() {
} else if tag, ok := oldobj.(*object.Tag); ok {
oldobj, err = repo.CommitObject(tag.Target)
if err != nil {
logger.Println("old tag cannot be resolved: %e", err)
logger.Printf("old tag cannot be resolved: %v", err)
continue
}
}
@ -261,7 +261,7 @@ func postUpdate() {
}
newobj, err = repo.CommitObject(tag.Target)
if err != nil {
logger.Println("new tag cannot be resovled: %e", err)
logger.Printf("new tag cannot be resovled: %v", err)
continue
}
}

8
gitsrht-update-hook/webhooks.go
View File

@ -89,7 +89,7 @@ func deliverWebhooks(subs []WebhookSubscription,
resp, err := client.Do(req)
if err != nil {
delivery.Response = fmt.Sprintf("Error sending webhook: %v", err)
log.Printf(delivery.Response)
log.Println(delivery.Response)
deliveries = append(deliveries, delivery)
continue
}
@ -98,19 +98,19 @@ func deliverWebhooks(subs []WebhookSubscription,
if err != nil {
delivery.Response = fmt.Sprintf("Error reading webhook "+
"response: %v", err)
log.Printf(delivery.Response)
log.Println(delivery.Response)
deliveries = append(deliveries, delivery)
continue
}
if !utf8.Valid(respBody) {
delivery.Response = "Webhook response is not valid UTF-8"
log.Printf(delivery.Response)
log.Println(delivery.Response)
deliveries = append(deliveries, delivery)
continue
}
if printResponse {
u, _ := url.Parse(sub.Url) // Errors will have happened earlier
log.Println("Response from %s:", u.Host)
log.Printf("Response from %s:", u.Host)
log.Println(runewidth.Truncate(ansi.ReplaceAllString(
string(respBody), ""), 1024, "..."))
}