Merge pull request #37 from bsdlp/merge_goji_logger

merge derekdowling/goji2-logger
derekdowling · Oct 6, 2016 · 0206f41 · 0206f41
2 parents 1afdc1a + 031596a
commit 0206f41
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 65 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/_vendor/github.com/derekdowling/goji2-logger/.gitignore b/_vendor/github.com/derekdowling/goji2-logger/.gitignore
diff --git a/_vendor/github.com/derekdowling/goji2-logger/Godeps/Godeps.json b/_vendor/github.com/derekdowling/goji2-logger/Godeps/Godeps.json
diff --git a/_vendor/github.com/derekdowling/goji2-logger/Godeps/Readme b/_vendor/github.com/derekdowling/goji2-logger/Godeps/Readme
diff --git a/...hub.com/derekdowling/goji2-logger/LICENSE → goji2-logger/LICENSE b/...hub.com/derekdowling/goji2-logger/LICENSE → goji2-logger/LICENSE
diff --git a/...b.com/derekdowling/goji2-logger/README.md → goji2-logger/README.md b/...b.com/derekdowling/goji2-logger/README.md → goji2-logger/README.md
diff --git a/...derekdowling/goji2-logger/color_writer.go → goji2-logger/color_writer.go b/...derekdowling/goji2-logger/color_writer.go → goji2-logger/color_writer.go
diff --git a/...b.com/derekdowling/goji2-logger/logger.go → goji2-logger/logger.go b/...b.com/derekdowling/goji2-logger/logger.go → goji2-logger/logger.go
@@ -112,7 +112,7 @@ func (l *Logger) printRequest(ctx context.Context, r *http.Request) {
 	}
 
 	colorWrite(&buf, bBlue, "%q", urlStr)
-	log.Print(buf.String())
+	l.Logger.Print(buf.String())
 }
 
 func (l *Logger) printResponse(w mutil.WriterProxy, delta time.Duration) {
@@ -143,5 +143,5 @@ func (l *Logger) printResponse(w mutil.WriterProxy, delta time.Duration) {
 		colorWrite(&buf, nRed, "%s", delta.String())
 	}
 
-	log.Print(buf.String())
+	l.Logger.Print(buf.String())
 }
diff --git a/jsh-api/api.go b/jsh-api/api.go
@@ -10,8 +10,8 @@ import (
 	"goji.io"
 	"goji.io/pat"
 
+	"github.com/derekdowling/go-json-spec-handler/goji2-logger"
 	"github.com/derekdowling/go-stdlogger"
-	"github.com/derekdowling/goji2-logger"
 )
 
 // API is used to direct HTTP requests to resources