mirrors/diun
1
0
Fork 0
mirror of https://github.com/crazy-max/diun.git synced 2025-12-24 06:28:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #741 from crazy-max/fix-panic

Browse Source 
Fix panics when parsing notification templates
This commit is contained in:
CrazyMax
2022-12-28 03:16:59 +01:00
committed by GitHub
parent 1752896acf 00edf2c7d9
commit 8262ec86f1
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
internal/app/hc.go
View File

@@ -36,6 +36,7 @@ func (di *Diun) HealthchecksSuccess(entries *model.NotifEntries) {
* {{ .CountError }} tag(s) with error`))
if err := logsTpl.Execute(&logsBuf, entries); err != nil {
log.Error().Err(err).Msgf("Cannot create logs for Healthchecks success event")
return
}
if err := di.hc.Success(context.Background(), gohealthchecks.PingingOptions{

22
internal/msg/client.go
View File

@@ -37,31 +37,35 @@ func New(opts Options) (*Client, error) {
}
// RenderMarkdown returns a notification message as markdown
func (c *Client) RenderMarkdown() (title []byte, body []byte, err error) {
func (c *Client) RenderMarkdown() (title []byte, body []byte, _ error) {
var titleBuf bytes.Buffer
titleTpl := template.Must(template.New("title").Funcs(c.opts.TemplateFuncs).Parse(strings.TrimSuffix(strings.TrimSpace(c.opts.TemplateTitle), "\n")))
err = titleTpl.Execute(&titleBuf, struct {
titleTpl, err := template.New("title").Funcs(c.opts.TemplateFuncs).Parse(strings.TrimSuffix(strings.TrimSpace(c.opts.TemplateTitle), "\n"))
if err != nil {
return title, body, errors.Wrap(err, "Cannot parse title template")
}
if err = titleTpl.Execute(&titleBuf, struct {
Meta model.Meta
Entry model.NotifEntry
}{
Meta: c.opts.Meta,
Entry: c.opts.Entry,
})
if err != nil {
}); err != nil {
return title, body, errors.Wrap(err, "Cannot render notif title")
}
title = titleBuf.Bytes()
var bodyBuf bytes.Buffer
bodyTpl := template.Must(template.New("body").Funcs(c.opts.TemplateFuncs).Parse(strings.TrimSuffix(strings.TrimSpace(c.opts.TemplateBody), "\n")))
err = bodyTpl.Execute(&bodyBuf, struct {
bodyTpl, err := template.New("body").Funcs(c.opts.TemplateFuncs).Parse(strings.TrimSuffix(strings.TrimSpace(c.opts.TemplateBody), "\n"))
if err != nil {
return title, body, errors.Wrap(err, "Cannot parse body template")
}
if err = bodyTpl.Execute(&bodyBuf, struct {
Meta model.Meta
Entry model.NotifEntry
}{
Meta: c.opts.Meta,
Entry: c.opts.Entry,
})
if err != nil {
}); err != nil {
return title, body, errors.Wrap(err, "Cannot render notif body")
}
body = bodyBuf.Bytes()