Merge pull request #307 from ayuryshev/feature/move-metrics-and-httpu…

…til-into-pkg-306

Feature/move metrics and httputil into ./pkg/

cmd/setup-node/commands/root.go

@@ -15,7 +15,7 @@ import (
 	"github.com/skycoin/skycoin/src/util/logging"
 	"github.com/spf13/cobra"
 
-	"github.com/skycoin/skywire/internal/metrics"
+	"github.com/skycoin/skywire/pkg/metrics"
 	"github.com/skycoin/skywire/pkg/setup"
 )
 

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6
 	github.com/go-chi/chi v4.0.2+incompatible
 	github.com/google/uuid v1.1.1
+	github.com/gorilla/handlers v1.4.0
 	github.com/gorilla/securecookie v1.1.1
 	github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect

go.sum

@@ -13,6 +13,8 @@ github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZsA=
+github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1vq2e6IsrXKrZit1bv/TDYFGMp4BQ=

internal/httputil/json.go → pkg/httputil/httputil.go

@@ -3,7 +3,11 @@ package httputil
 import (
 	"encoding/json"
 	"fmt"
+	"io"
+	"net"
 	"net/http"
+
+	"github.com/gorilla/handlers"
 )
 
 // WriteJSON writes a json object on a http.ResponseWriter with the given code,
@@ -43,3 +47,17 @@ func BoolFromQuery(r *http.Request, key string, defaultVal bool) (bool, error) {
 		return false, fmt.Errorf("invalid '%s' query value of '%s'", key, q)
 	}
 }
+
+// WriteLog writes request and response parameters using format that
+// works well with logging.Logger.
+func WriteLog(writer io.Writer, params handlers.LogFormatterParams) {
+	host, _, err := net.SplitHostPort(params.Request.RemoteAddr)
+	if err != nil {
+		host = params.Request.RemoteAddr
+	}
+
+	fmt.Fprintf(
+		writer, "%s - \"%s %s %s\" %d\n",
+		host, params.Request.Method, params.URL.String(), params.Request.Proto, params.StatusCode,
+	)
+}

pkg/manager/node.go

@@ -19,9 +19,9 @@ import (
 	"github.com/go-chi/chi/middleware"
 	"github.com/google/uuid"
 
-	"github.com/skycoin/skywire/internal/httputil"
 	"github.com/skycoin/skywire/internal/noise"
 	"github.com/skycoin/skywire/pkg/cipher"
+	"github.com/skycoin/skywire/pkg/httputil"
 	"github.com/skycoin/skywire/pkg/node"
 	"github.com/skycoin/skywire/pkg/routing"
 )

pkg/manager/user_manager.go

@@ -10,7 +10,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/gorilla/securecookie"
 
-	"github.com/skycoin/skywire/internal/httputil"
+	"github.com/skycoin/skywire/pkg/httputil"
 )
 
 const (

pkg/setup/node.go

@@ -8,7 +8,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/skycoin/skywire/internal/metrics"
+	"github.com/skycoin/skywire/pkg/metrics"
 
 	"github.com/skycoin/skycoin/src/util/logging"
 

pkg/setup/node_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/skycoin/skywire/internal/metrics"
+	"github.com/skycoin/skywire/pkg/metrics"
 
 	"github.com/skycoin/skycoin/src/util/logging"
 	"github.com/stretchr/testify/assert"