diff --git a/cmd/numerus/main.go b/cmd/numerus/main.go index c9d125b..5ee3c68 100644 --- a/cmd/numerus/main.go +++ b/cmd/numerus/main.go @@ -11,7 +11,7 @@ import ( "github.com/jackc/pgx/v4/pgxpool" - "dev.tandem.ws/tandem/numerus/pkg/router" + numerus "dev.tandem.ws/tandem/numerus/pkg" ) func main() { @@ -23,7 +23,7 @@ func main() { srv := http.Server{ Addr: ":8080", - Handler: router.NewRouter(dbpool), + Handler: numerus.NewRouter(dbpool), ReadTimeout: 5 * time.Second, WriteTimeout: 10 * time.Second, IdleTimeout: 2 * time.Minute, diff --git a/pkg/logger/middleware.go b/pkg/logger.go similarity index 98% rename from pkg/logger/middleware.go rename to pkg/logger.go index 3e411e1..618c120 100644 --- a/pkg/logger/middleware.go +++ b/pkg/logger.go @@ -1,4 +1,4 @@ -package logger +package pkg import ( "log" diff --git a/pkg/router/router.go b/pkg/router.go similarity index 93% rename from pkg/router/router.go rename to pkg/router.go index b21d899..46b03db 100644 --- a/pkg/router/router.go +++ b/pkg/router.go @@ -1,4 +1,4 @@ -package router +package pkg import ( "context" @@ -6,7 +6,6 @@ import ( "log" "net/http" - "dev.tandem.ws/tandem/numerus/pkg/logger" "github.com/jackc/pgx/v4/pgxpool" ) @@ -47,6 +46,6 @@ func NewRouter(db *pgxpool.Pool) http.Handler { } }) var handler http.Handler = router - handler = logger.Logger(handler) + handler = Logger(handler) return handler }