mystiq/rageshake
Archived
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove "XXX disabled" logs

Browse source
This commit is contained in:
Mathieu Velten 2020-09-09 14:49:45 +02:00
parent ba72ef4ef1
commit 20cfb8a28c
1 changed files with 56 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
submit.go
View file

@ -479,49 +479,43 @@ func (s *submitServer) saveReport(ctx context.Context, p parsedPayload, reportDi
} }
func (s *submitServer) submitGithubIssue(ctx context.Context, p parsedPayload, listingURL string, resp *submitResponse) error { func (s *submitServer) submitGithubIssue(ctx context.Context, p parsedPayload, listingURL string, resp *submitResponse) error {
if s.ghClient == nil { // submit a github issue
log.Println("GH issue submission disabled") ghProj := s.cfg.GithubProjectMappings[p.AppName]
} else { if ghProj == "" {
// submit a github issue log.Println("Not creating GH issue for unknown app", p.AppName)
ghProj := s.cfg.GithubProjectMappings[p.AppName] return nil
if ghProj == "" {
log.Println("Not creating GH issue for unknown app", p.AppName)
return nil
}
splits := strings.SplitN(ghProj, "/", 2)
if len(splits) < 2 {
log.Println("Can't create GH issue for invalid repo", ghProj)
}
owner, repo := splits[0], splits[1]
issueReq := buildGithubIssueRequest(p, listingURL)
issue, _, err := s.ghClient.Issues.Create(ctx, owner, repo, &issueReq)
if err != nil {
return err
}
log.Println("Created issue:", *issue.HTMLURL)
resp.ReportURL = *issue.HTMLURL
} }
splits := strings.SplitN(ghProj, "/", 2)
if len(splits) < 2 {
log.Println("Can't create GH issue for invalid repo", ghProj)
}
owner, repo := splits[0], splits[1]
issueReq := buildGithubIssueRequest(p, listingURL)
issue, _, err := s.ghClient.Issues.Create(ctx, owner, repo, &issueReq)
if err != nil {
return err
}
log.Println("Created issue:", *issue.HTMLURL)
resp.ReportURL = *issue.HTMLURL
return nil return nil
} }
func (s *submitServer) submitSlackNotification(p parsedPayload, listingURL string) error { func (s *submitServer) submitSlackNotification(p parsedPayload, listingURL string) error {
if s.slack == nil { slackBuf := fmt.Sprintf(
log.Println("Slack notifications disabled") "%s\nApplication: %s\nReport: %s",
} else { p.UserText, p.AppName, listingURL,
slackBuf := fmt.Sprintf( )
"%s\nApplication: %s\nReport: %s",
p.UserText, p.AppName, listingURL,
)
err := s.slack.Notify(slackBuf) err := s.slack.Notify(slackBuf)
if err != nil { if err != nil {
return err return err
}
} }
return nil return nil
} }
@ -587,37 +581,34 @@ func buildGithubIssueRequest(p parsedPayload, listingURL string) github.IssueReq
} }
func (s *submitServer) sendEmail(p parsedPayload, reportDir string) error { func (s *submitServer) sendEmail(p parsedPayload, reportDir string) error {
if s.cfg.SMTPServer == "" { e := email.NewEmail()
log.Println("Email submission disabled")
} else {
e := email.NewEmail()
e.From = "Rageshake <rageshake@matrix.org>" e.From = "Rageshake <rageshake@matrix.org>"
if s.cfg.EmailFrom != "" { if s.cfg.EmailFrom != "" {
e.From = s.cfg.EmailFrom e.From = s.cfg.EmailFrom
}
e.To = s.cfg.EmailAddresses
e.Subject = fmt.Sprintf("[%s] %s", p.AppName, buildReportTitle(p))
e.Text = buildReportBody(p, "\"").Bytes()
allFiles := append(p.Files, p.Logs...)
for _, file := range allFiles {
fullPath := filepath.Join(reportDir, file)
e.AttachFile(fullPath)
}
var auth smtp.Auth = nil
if s.cfg.SMTPPassword != "" || s.cfg.SMTPUsername != "" {
auth = smtp.PlainAuth("", s.cfg.SMTPUsername, s.cfg.SMTPPassword, s.cfg.SMTPServer)
}
err := e.Send(s.cfg.SMTPServer, auth)
if err != nil {
return err
}
} }
e.To = s.cfg.EmailAddresses
e.Subject = fmt.Sprintf("[%s] %s", p.AppName, buildReportTitle(p))
e.Text = buildReportBody(p, "\"").Bytes()
allFiles := append(p.Files, p.Logs...)
for _, file := range allFiles {
fullPath := filepath.Join(reportDir, file)
e.AttachFile(fullPath)
}
var auth smtp.Auth = nil
if s.cfg.SMTPPassword != "" || s.cfg.SMTPUsername != "" {
auth = smtp.PlainAuth("", s.cfg.SMTPUsername, s.cfg.SMTPPassword, s.cfg.SMTPServer)
}
err := e.Send(s.cfg.SMTPServer, auth)
if err != nil {
return err
}
return nil return nil
} }