Skip to content

Commit cbe17a4

Browse files
committed
chore(http-server): use the new api
1 parent 1159863 commit cbe17a4

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

cmd/gogit-http-server/logging.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ func (r *logWriter) WriteHeader(code int) {
2828
// LoggingMiddleware is the logging middleware where we log incoming and
2929
// outgoing requests for a multiplexer. It should be the first middleware
3030
// called so it can log request times accurately.
31-
func LoggingMiddleware(logger *log.Logger, next http.Handler) http.Handler {
32-
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
31+
func LoggingMiddleware(logger *log.Logger, next http.Handler) http.HandlerFunc {
32+
return func(w http.ResponseWriter, r *http.Request) {
3333
addr := r.RemoteAddr
3434
if colon := strings.LastIndex(addr, ":"); colon != -1 {
3535
addr = addr[:colon]
@@ -46,5 +46,5 @@ func LoggingMiddleware(logger *log.Logger, next http.Handler) http.Handler {
4646

4747
elapsedTime := time.Since(startTime)
4848
logger.Printf("%s %s %s %s %d %dB %v", addr, r.Method, r.RequestURI, r.Proto, writer.code, writer.bytes, elapsedTime)
49-
})
49+
}
5050
}

cmd/gogit-http-server/main.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,10 @@ var rootCmd = &cobra.Command{
3838
log.Printf("Using absolute path: %q", abs)
3939
logger := log.Default()
4040
loader := transport.NewFilesystemLoader(osfs.New(abs, osfs.WithBoundOS()), false)
41-
gitmw := &githttp.Handler{
42-
Loader: loader,
41+
gitmw := githttp.NewBackend(loader, &githttp.BackendOptions{
4342
ErrorLog: logger,
4443
Prefix: prefix,
45-
}
44+
})
4645

4746
handler := LoggingMiddleware(logger, gitmw)
4847
log.Printf("Starting server on %q for directory %q", addr, directory)

0 commit comments

Comments
 (0)