Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1352)

Unified Diff: datahopper_internal/go/datahopper_internal/main.go

Issue 1820863002: Update callers of httputils.ReportError to specify message (Closed) Base URL: https://skia.googlesource.com/buildbot@master
Patch Set: Remove taskID Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ct/go/ctfe/task_common/task_common.go ('k') | go/httputils/http.go » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: datahopper_internal/go/datahopper_internal/main.go
diff --git a/datahopper_internal/go/datahopper_internal/main.go b/datahopper_internal/go/datahopper_internal/main.go
index 6a6b42b5c0b4acaa9dde7aef4ea63430c3e26a35..c72472e0d4345e2fed8215e6e5ff8970f356115d 100644
--- a/datahopper_internal/go/datahopper_internal/main.go
+++ b/datahopper_internal/go/datahopper_internal/main.go
@@ -345,7 +345,7 @@ func redirectHandler(w http.ResponseWriter, r *http.Request) {
}
if result == "" {
glog.Errorf("No redirect for %#v", build)
- httputils.ReportError(w, r, fmt.Errorf("No redirect for this build."), "")
+ httputils.ReportError(w, r, nil, "No redirect for this build.")
return
}
w.Header().Set("Content-Type", "text/html")
@@ -387,20 +387,20 @@ func ingestBuildHandler(w http.ResponseWriter, r *http.Request) {
data, err := webhook.AuthenticateRequest(r)
if err != nil {
glog.Errorf("Failed authentication in ingestBuildHandler: %s", err)
- httputils.ReportError(w, r, fmt.Errorf("Failed authentication."), "")
+ httputils.ReportError(w, r, nil, "Failed authentication.")
return
}
vars := map[string]string{}
if err := json.Unmarshal(data, &vars); err != nil {
glog.Errorf("Failed to parse request: %s", err)
- httputils.ReportError(w, r, fmt.Errorf("Failed to parse request."), "")
+ httputils.ReportError(w, r, nil, "Failed to parse request.")
return
}
target := vars["target"]
commitHash := vars["commitHash"]
status := vars["status"]
if target == "" || commitHash == "" || status == "" {
- httputils.ReportError(w, r, fmt.Errorf("Missing parameter."), "")
+ httputils.ReportError(w, r, nil, "Missing parameter.")
return
}
cl := vars["changeListNumber"]
@@ -414,13 +414,13 @@ func ingestBuildHandler(w http.ResponseWriter, r *http.Request) {
codename = util.StringToCodeName(target)
}
if !ingestBuildWebhookCodenames[codename] {
- httputils.ReportError(w, r, fmt.Errorf("Unrecognized target (mapped to codename %s)", codename), "")
+ httputils.ReportError(w, r, nil, fmt.Sprintf("Unrecognized target (mapped to codename %s)", codename))
return
}
buildbotResults, err := buildbot.ParseResultsString(status)
if err != nil {
glog.Errorf("Invalid status parameter: %s", err)
- httputils.ReportError(w, r, fmt.Errorf("Invalid status parameter."), "")
+ httputils.ReportError(w, r, nil, "Invalid status parameter.")
return
}
startTime := time.Now().UTC()
@@ -429,7 +429,7 @@ func ingestBuildHandler(w http.ResponseWriter, r *http.Request) {
startTime = time.Unix(t, 0).UTC()
} else {
glog.Errorf("Invalid startTime parameter: %s", err)
- httputils.ReportError(w, r, fmt.Errorf("Invalid startTime parameter."), "")
+ httputils.ReportError(w, r, nil, "Invalid startTime parameter.")
return
}
}
@@ -439,7 +439,7 @@ func ingestBuildHandler(w http.ResponseWriter, r *http.Request) {
finishTime = time.Unix(t, 0).UTC()
} else {
glog.Errorf("Invalid finishTime parameter: %s", err)
- httputils.ReportError(w, r, fmt.Errorf("Invalid finishTime parameter."), "")
+ httputils.ReportError(w, r, nil, "Invalid finishTime parameter.")
return
}
}
@@ -467,7 +467,7 @@ func ingestBuildHandler(w http.ResponseWriter, r *http.Request) {
b.Properties = append(b.Properties, []interface{}{"changeListNumber", strconv.Itoa(clNum), "datahopper_internal"})
} else {
glog.Errorf("Invalid changeListNumber parameter: %s", err)
- httputils.ReportError(w, r, fmt.Errorf("Invalid changeListNumber parameter."), "")
+ httputils.ReportError(w, r, nil, "Invalid changeListNumber parameter.")
return
}
}
@@ -476,7 +476,7 @@ func ingestBuildHandler(w http.ResponseWriter, r *http.Request) {
b.Properties = append(b.Properties, []interface{}{"testResultsLink", url.String(), "datahopper_internal"})
} else {
glog.Errorf("Invalid testResultsLink parameter: %s", err)
- httputils.ReportError(w, r, fmt.Errorf("Invalid testResultsLink parameter."), "")
+ httputils.ReportError(w, r, nil, "Invalid testResultsLink parameter.")
return
}
}
@@ -489,12 +489,12 @@ func ingestBuildHandler(w http.ResponseWriter, r *http.Request) {
}
if err := repos.Update(); err != nil {
glog.Errorf("Failed to update repos: %s", err)
- httputils.ReportError(w, r, fmt.Errorf("Failed to update repos."), "")
+ httputils.ReportError(w, r, nil, "Failed to update repos.")
return
}
if err := ingestBuild(b, commitHash, target); err != nil {
glog.Errorf("Failed to ingest build: %s", err)
- httputils.ReportError(w, r, fmt.Errorf("Failed to ingest build."), "")
+ httputils.ReportError(w, r, nil, "Failed to ingest build.")
return
}
if metric, present := ingestBuildWebhookLiveness[codename]; present {
« no previous file with comments | « ct/go/ctfe/task_common/task_common.go ('k') | go/httputils/http.go » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698