Extract thirdparty/loggables

License: MIT
Signed-off-by: George Antoniadis <george@noodles.gr>

cmd/ipfs/main.go

@@ -32,7 +32,7 @@ import (
 	repo "github.com/ipfs/go-ipfs/repo"
 	config "github.com/ipfs/go-ipfs/repo/config"
 	fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
-	loggables "github.com/ipfs/go-ipfs/thirdparty/loggables"
+	loggables "gx/ipfs/QmYrv4LgCC8FhG2Ab4bwuq5DqBdwMtx3hMb3KKJDZcr2d7/go-libp2p-loggables"
 )
 
 // log is the command logger

core/bootstrap.go

@@ -9,8 +9,8 @@ import (
 	"time"
 
 	config "github.com/ipfs/go-ipfs/repo/config"
-	lgbl "github.com/ipfs/go-ipfs/thirdparty/loggables"
 	math2 "github.com/ipfs/go-ipfs/thirdparty/math2"
+	lgbl "gx/ipfs/QmYrv4LgCC8FhG2Ab4bwuq5DqBdwMtx3hMb3KKJDZcr2d7/go-libp2p-loggables"
 
 	goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
 	procctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"

exchange/bitswap/bitswap.go

@@ -8,6 +8,8 @@ import (
 	"sync"
 	"time"
 
+	key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
+
 	blocks "github.com/ipfs/go-ipfs/blocks"
 	blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
 	exchange "github.com/ipfs/go-ipfs/exchange"
@@ -18,8 +20,7 @@ import (
 	wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
 	flags "github.com/ipfs/go-ipfs/flags"
 	"github.com/ipfs/go-ipfs/thirdparty/delay"
-	loggables "github.com/ipfs/go-ipfs/thirdparty/loggables"
-	key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
+	loggables "gx/ipfs/QmYrv4LgCC8FhG2Ab4bwuq5DqBdwMtx3hMb3KKJDZcr2d7/go-libp2p-loggables"
 
 	process "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
 	procctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"

fuse/readonly/readonly_unix.go

@@ -9,17 +9,18 @@ import (
 	"os"
 	"syscall"
 
+	logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
+	proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
+	"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
+
 	fuse "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
 	fs "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
 	core "github.com/ipfs/go-ipfs/core"
 	mdag "github.com/ipfs/go-ipfs/merkledag"
 	path "github.com/ipfs/go-ipfs/path"
-	lgbl "github.com/ipfs/go-ipfs/thirdparty/loggables"
 	uio "github.com/ipfs/go-ipfs/unixfs/io"
 	ftpb "github.com/ipfs/go-ipfs/unixfs/pb"
-	logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
-	proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
-	"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
+	lgbl "gx/ipfs/QmYrv4LgCC8FhG2Ab4bwuq5DqBdwMtx3hMb3KKJDZcr2d7/go-libp2p-loggables"
 )
 
 var log = logging.Logger("fuse/ipfs")

package.json

@@ -233,6 +233,12 @@
       "hash": "QmUHmMGmcwCrjHQHcYhBnqGCSWs5pBSMbGZmfwavETR1gg",
       "name": "go-ds-leveldb",
       "version": "1.0.0"
+    },
+    {
+      "author": "whyrusleeping",
+      "hash": "QmYrv4LgCC8FhG2Ab4bwuq5DqBdwMtx3hMb3KKJDZcr2d7",
+      "name": "go-libp2p-loggables",
+      "version": "1.0.11"
     }
   ],
   "gxVersion": "0.4.0",

routing/dht/handlers.go

@@ -5,11 +5,12 @@ import (
 	"fmt"
 	"time"
 
-	pb "github.com/ipfs/go-ipfs/routing/dht/pb"
-	lgbl "github.com/ipfs/go-ipfs/thirdparty/loggables"
 	ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
 	key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
 
+	pb "github.com/ipfs/go-ipfs/routing/dht/pb"
+	lgbl "gx/ipfs/QmYrv4LgCC8FhG2Ab4bwuq5DqBdwMtx3hMb3KKJDZcr2d7/go-libp2p-loggables"
+
 	pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
 	peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
 	proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"

routing/supernode/client.go

@@ -5,11 +5,12 @@ import (
 	"errors"
 	"time"
 
+	key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
+
 	routing "github.com/ipfs/go-ipfs/routing"
 	pb "github.com/ipfs/go-ipfs/routing/dht/pb"
 	proxy "github.com/ipfs/go-ipfs/routing/supernode/proxy"
-	loggables "github.com/ipfs/go-ipfs/thirdparty/loggables"
-	key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
+	loggables "gx/ipfs/QmYrv4LgCC8FhG2Ab4bwuq5DqBdwMtx3hMb3KKJDZcr2d7/go-libp2p-loggables"
 
 	pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
 	logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"

routing/supernode/proxy/standard.go

@@ -12,10 +12,11 @@ import (
 	host "gx/ipfs/Qmf4ETeAWXuThBfWwonVyFqGFSgTWepUDEr1txcctvpTXS/go-libp2p/p2p/host"
 	inet "gx/ipfs/Qmf4ETeAWXuThBfWwonVyFqGFSgTWepUDEr1txcctvpTXS/go-libp2p/p2p/net"
 
+	key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
+
 	dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
 	kbucket "github.com/ipfs/go-ipfs/routing/kbucket"
-	loggables "github.com/ipfs/go-ipfs/thirdparty/loggables"
-	key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
+	loggables "gx/ipfs/QmYrv4LgCC8FhG2Ab4bwuq5DqBdwMtx3hMb3KKJDZcr2d7/go-libp2p-loggables"
 )
 
 const ProtocolSNR = "/ipfs/supernoderouting"

thirdparty/loggables/loggables.go

-// Package loggables includes a bunch of translator functions for
-// commonplace/stdlib objects. This is boilerplate code that shouldn't change
-// much, and not sprinkled all over the place (i.e. gather it here).
-//
-// NOTE: it may make sense to put all stdlib Loggable functions in the eventlog
-// package. Putting it here for now in case we don't want to pollute it.
-package loggables
-
-import (
-	"net"
-
-	uuid "gx/ipfs/QmcyaFHbyiZfoX5GTpcqqCPYmbjYNAhRDekXSJPFHdYNSV/go.uuid"
-
-	ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
-
-	logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
-
-	peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
-)
-
-// NetConn returns an eventlog.Metadata with the conn addresses
-func NetConn(c net.Conn) logging.Loggable {
-	return logging.Metadata{
-		"localAddr":  c.LocalAddr(),
-		"remoteAddr": c.RemoteAddr(),
-	}
-}
-
-// Error returns an eventlog.Metadata with an error
-func Error(e error) logging.Loggable {
-	return logging.Metadata{
-		"error": e.Error(),
-	}
-}
-
-func Uuid(key string) logging.Metadata {
-	return logging.Metadata{
-		key: uuid.NewV4().String(),
-	}
-}
-
-// Dial metadata is metadata for dial events
-func Dial(sys string, lid, rid peer.ID, laddr, raddr ma.Multiaddr) DeferredMap {
-	m := DeferredMap{}
-	m["subsystem"] = sys
-	if lid != "" {
-		m["localPeer"] = func() interface{} { return lid.Pretty() }
-	}
-	if laddr != nil {
-		m["localAddr"] = func() interface{} { return laddr.String() }
-	}
-	if rid != "" {
-		m["remotePeer"] = func() interface{} { return rid.Pretty() }
-	}
-	if raddr != nil {
-		m["remoteAddr"] = func() interface{} { return raddr.String() }
-	}
-	return m
-}
-
-// DeferredMap is a Loggable which may contain deferred values.
-type DeferredMap map[string]interface{}
-
-// Loggable describes objects that can be marshalled into Metadata for logging
-func (m DeferredMap) Loggable() map[string]interface{} {
-	m2 := map[string]interface{}{}
-	for k, v := range m {
-
-		if vf, ok := v.(func() interface{}); ok {
-			// if it's a DeferredVal, call it.
-			m2[k] = vf()
-
-		} else {
-			// else use the value as is.
-			m2[k] = v
-		}
-	}
-	return m2
-}