Skip to content

Commit e40ca21

Browse files
joeybloggsjoeybloggs
joeybloggs
authored and
joeybloggs
committed
update http handler errors
1 parent 5686559 commit e40ca21

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

handlers/http/http.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -304,13 +304,13 @@ func HandleLog(h HTTP, entries <-chan *log.Entry) {
304304

305305
resp, err := httpClient.Do(req)
306306
if err != nil {
307-
fmt.Printf("**** WARNING Could not post data to %s: %v\n", remoteHost, err)
307+
log.Error("Could not post data to %s: %v\n", remoteHost, err)
308308
goto END
309309
}
310310

311311
if resp.StatusCode < 200 || resp.StatusCode >= 299 {
312312
bt, _ := ioutil.ReadAll(resp.Body)
313-
fmt.Printf("WARNING Received HTTP %d during POST request to %s body: %s\n", resp.StatusCode, remoteHost, string(bt))
313+
log.Error("Received HTTP %d during POST request to %s body: %s\n", resp.StatusCode, remoteHost, string(bt))
314314
}
315315

316316
END:

handlers/http/http_test.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func TestHTTPLogger(t *testing.T) {
5151
hLog.SetBuffersAndWorkers(0, 0)
5252
hLog.SetTimestampFormat("MST")
5353
log.SetCallerInfoLevels(log.WarnLevel, log.ErrorLevel, log.PanicLevel, log.AlertLevel, log.FatalLevel)
54-
log.RegisterHandler(hLog, log.AllLevels...)
54+
log.RegisterHandler(hLog, log.DebugLevel, log.TraceLevel, log.InfoLevel, log.NoticeLevel, log.WarnLevel, log.PanicLevel, log.AlertLevel, log.FatalLevel)
5555

5656
for i, tt := range tests {
5757

@@ -129,7 +129,7 @@ func TestBadValues(t *testing.T) {
129129
return []byte(e.Message)
130130
}
131131
})
132-
log.RegisterHandler(hLog, log.AllLevels...)
132+
log.RegisterHandler(hLog, log.DebugLevel, log.TraceLevel, log.InfoLevel, log.NoticeLevel, log.WarnLevel, log.PanicLevel, log.AlertLevel, log.FatalLevel)
133133

134134
log.Debug("debug")
135135
}
@@ -154,18 +154,18 @@ func TestSetFilenameDisplay(t *testing.T) {
154154

155155
hLog, err := New(server.URL, "POST", header)
156156
if err != nil {
157-
log.Fatalf("Error initializing HTTP recieved '%s'", err)
157+
t.Fatalf("Error initializing HTTP recieved '%s'", err)
158158
}
159159

160160
hLog.SetBuffersAndWorkers(0, 1)
161161
hLog.SetTimestampFormat("MST")
162162
hLog.SetFilenameDisplay(log.Llongfile)
163163

164-
log.RegisterHandler(hLog, log.AllLevels...)
164+
log.RegisterHandler(hLog, log.DebugLevel, log.TraceLevel, log.InfoLevel, log.NoticeLevel, log.WarnLevel, log.PanicLevel, log.AlertLevel, log.FatalLevel)
165165

166-
log.Error("error")
167-
if msg != "UTC ERROR github.com/go-playground/log/handlers/http/http_test.go:166 error" {
168-
t.Errorf("Expected '%s' Got '%s'", "UTC ERROR github.com/go-playground/log/handlers/http/http_test.go:166 error", msg)
166+
log.Alert("alert")
167+
if msg != "UTC ALERT github.com/go-playground/log/handlers/http/http_test.go:166 alert" {
168+
t.Errorf("Expected '%s' Got '%s'", "UTC ALERT github.com/go-playground/log/handlers/http/http_test.go:166 alert", msg)
169169
}
170170
}
171171

@@ -208,12 +208,12 @@ func getTestHTTPLoggerTests() []test {
208208
flds: nil,
209209
want: "UTC WARN http_test.go:76 warn",
210210
},
211-
{
212-
lvl: log.ErrorLevel,
213-
msg: "error",
214-
flds: nil,
215-
want: "UTC ERROR http_test.go:78 error",
216-
},
211+
// {
212+
// lvl: log.ErrorLevel,
213+
// msg: "error",
214+
// flds: nil,
215+
// want: "UTC ERROR http_test.go:78 error",
216+
// },
217217
{
218218
lvl: log.AlertLevel,
219219
msg: "alert",

0 commit comments

Comments
 (0)