From 522acd50641c332eebca7f73e38782698f059d9a Mon Sep 17 00:00:00 2001 From: Jordan Orelli Date: Sat, 1 Nov 2014 19:56:51 -0400 Subject: [PATCH] oh that was a bad error path. --- main.go | 1 - wrappers.go | 9 +++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index eb0c485..e4fe773 100644 --- a/main.go +++ b/main.go @@ -36,7 +36,6 @@ func main() { http.Handle("/", &logWrapper{http.FileServer(dir)}) addr := fmt.Sprintf("%s:%d", options.hostname, options.port) - log.Printf("init [pid: %d] [machineId: %x] [addr: %s] [cwd: %s]", global.pid, string(global.machineId), addr, cwd) if err := http.ListenAndServe(addr, nil); err != nil { bail(1, "unable to start server: %v", err) } diff --git a/wrappers.go b/wrappers.go index 2a67c33..a8f9815 100644 --- a/wrappers.go +++ b/wrappers.go @@ -14,6 +14,11 @@ type logWrapper struct { } func (l *logWrapper) ServeHTTP(w http.ResponseWriter, r *http.Request) { + if r.URL.Path == "/favicon.ico" { + l.Handler.ServeHTTP(w, r) + return + } + id := newRequestId() if IsTerminal(os.Stdout.Fd()) { log.Println(termcolors.WrapString(termcolors.Magenta, id.String()), r.Method, r.URL) @@ -52,8 +57,8 @@ func (w *writerWatcher) PrettyStatus() string { return s } switch { - case w.headerWritten < 100: - panic("wtf") + case w.headerWritten == 0: + return termcolors.WrapString(termcolors.Green, "200") case w.headerWritten < 200: return termcolors.WrapString(termcolors.White, s) case w.headerWritten < 300: