~edwargix/git.sr.ht

4bddca82e9b2dce343a31d2e4e5d7f76e0a9cb9d — Simon Ser 2 years ago f5db865
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
2 files changed, 6 insertions(+), 6 deletions(-)

M gitsrht-update-hook/post-update.go
M gitsrht-update-hook/webhooks.go
M gitsrht-update-hook/post-update.go => gitsrht-update-hook/post-update.go +2 -2
@@ 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
			}
		}

M gitsrht-update-hook/webhooks.go => gitsrht-update-hook/webhooks.go +4 -4
@@ 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, "..."))
		}