serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-22 02:15:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Abiola Ibrahim 2015-07-06 06:43:02 +01:00
commit d4f0ac2303
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
middleware/errors/errors.go
View file

@ -9,6 +9,7 @@ import (
"os" "os"
"runtime" "runtime"
"strings" "strings"
"time"
"github.com/mholt/caddy/middleware" "github.com/mholt/caddy/middleware"
) )
@ -27,7 +28,7 @@ func (h ErrorHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, er
status, err := h.Next.ServeHTTP(w, r) status, err := h.Next.ServeHTTP(w, r)
if err != nil { if err != nil {
h.Log.Printf("[ERROR %d %s] %v", status, r.URL.Path, err) h.Log.Printf("%s [ERROR %d %s] %v", time.Now().Format(timeFormat), status, r.URL.Path, err)
} }
if status >= 400 { if status >= 400 {
@ -107,8 +108,9 @@ func (h ErrorHandler) recovery(w http.ResponseWriter, r *http.Request) {
} }
// Currently we don't use the function name, as file:line is more conventional // Currently we don't use the function name, as file:line is more conventional
h.Log.Printf("[PANIC %s] %s:%d - %v", r.URL.String(), file, line, rec) h.Log.Printf("%s [PANIC %s] %s:%d - %v", time.Now().Format(timeFormat), r.URL.String(), file, line, rec)
h.errorPage(w, http.StatusInternalServerError) h.errorPage(w, http.StatusInternalServerError)
} }
const DefaultLogFilename = "error.log" const DefaultLogFilename = "error.log"
const timeFormat = "02/Jan/2006:15:04:05 -0700"

3
middleware/errors/errors_test.go
View file

@ -9,6 +9,7 @@ import (
"net/http/httptest" "net/http/httptest"
"os" "os"
"path/filepath" "path/filepath"
"strings"
"testing" "testing"
"github.com/mholt/caddy/middleware" "github.com/mholt/caddy/middleware"
@ -109,7 +110,7 @@ func TestErrors(t *testing.T) {
t.Errorf("Test %d: Expected body %q, but got %q", t.Errorf("Test %d: Expected body %q, but got %q",
i, test.expectedBody, body) i, test.expectedBody, body)
} }
if log := buf.String(); log != test.expectedLog { if log := buf.String(); !strings.Contains(log, test.expectedLog) {
t.Errorf("Test %d: Expected log %q, but got %q", t.Errorf("Test %d: Expected log %q, but got %q",
i, test.expectedLog, log) i, test.expectedLog, log)
} }