Cleaning up dependencies.

hub/api/api.go

@@ -11,8 +11,8 @@ import (
 	"vppn/hub/errs"
 	"vppn/m"
 
-	"git.crumpington.com/lib/go/idgen"
-	"git.crumpington.com/lib/go/sqliteutil"
+	"git.crumpington.com/lib/idgen"
+	"git.crumpington.com/lib/sqliteutil"
 	"golang.org/x/crypto/bcrypt"
 )
 

hub/app.go

@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 	"vppn/hub/api"
 
-	"git.crumpington.com/lib/go/keyedmutex"
-	"git.crumpington.com/lib/go/webutil"
+	"git.crumpington.com/lib/keyedmutex"
+	"git.crumpington.com/lib/webutil"
 )
 
 //go:embed static

hub/form.go

@@ -4,7 +4,7 @@ import (
 	"net/url"
 	"vppn/hub/api"
 
-	"git.crumpington.com/lib/go/webutil"
+	"git.crumpington.com/lib/webutil"
 )
 
 func (app *App) formGetNetwork(form url.Values) (*api.Network, error) {

hub/handler.go

@@ -7,7 +7,7 @@ import (
 	"vppn/hub/api"
 	"vppn/hub/errs"
 
-	"git.crumpington.com/lib/go/webutil"
+	"git.crumpington.com/lib/webutil"
 )
 
 type handlerFunc func(s *api.Session, w http.ResponseWriter, r *http.Request) error
@@ -29,9 +29,7 @@ func (app *App) handlePub(pattern string, fn handlerFunc) {
 		}
 	}
 
-	app.mux.HandleFunc(pattern,
-		webutil.WithLogging(
-			wrapped))
+	app.mux.HandleFunc(pattern, wrapped)
 }
 
 func (app *App) handleNotSignedIn(pattern string, fn handlerFunc) {

hub/handlers.go

@@ -11,7 +11,7 @@ import (
 	"vppn/hub/errs"
 	"vppn/m"
 
-	"git.crumpington.com/lib/go/webutil"
+	"git.crumpington.com/lib/webutil"
 	"golang.org/x/crypto/bcrypt"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )

hub/main.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"time"
 
-	"git.crumpington.com/lib/go/webutil"
+	"git.crumpington.com/lib/webutil"
 )
 
 func Main() {