From 31c0506b85dd495579196af5371e9e68f65f05d9 Mon Sep 17 00:00:00 2001
From: David Wragg <david@wragg.org>
Date: Mon, 3 Aug 2015 14:07:16 +0100
Subject: [PATCH] Eliminate dotted imports of common for the sake of Log

---
 router/connection.go       | 2 --
 router/connection_maker.go | 2 --
 router/ethernet_decoder.go | 1 -
 router/gossip_channel.go   | 2 --
 router/local_peer.go       | 2 --
 router/router.go           | 2 --
 router/udp_sender.go       | 1 -
 router/utils.go            | 4 +++-
 8 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/router/connection.go b/router/connection.go
index 7eb7c5b0..98fa31a9 100644
--- a/router/connection.go
+++ b/router/connection.go
@@ -7,8 +7,6 @@ import (
 	"strconv"
 	"sync"
 	"time"
-
-	. "github.com/weaveworks/weave/common"
 )
 
 type Connection interface {
diff --git a/router/connection_maker.go b/router/connection_maker.go
index 9c65ce28..683e32ac 100644
--- a/router/connection_maker.go
+++ b/router/connection_maker.go
@@ -6,8 +6,6 @@ import (
 	"math/rand"
 	"net"
 	"time"
-
-	. "github.com/weaveworks/weave/common"
 )
 
 const (
diff --git a/router/ethernet_decoder.go b/router/ethernet_decoder.go
index 84a96d0d..82028f4d 100644
--- a/router/ethernet_decoder.go
+++ b/router/ethernet_decoder.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
-	. "github.com/weaveworks/weave/common"
 )
 
 type EthernetDecoder struct {
diff --git a/router/gossip_channel.go b/router/gossip_channel.go
index bb70bc20..ec295d34 100644
--- a/router/gossip_channel.go
+++ b/router/gossip_channel.go
@@ -5,8 +5,6 @@ import (
 	"encoding/gob"
 	"fmt"
 	"sync"
-
-	. "github.com/weaveworks/weave/common"
 )
 
 type GossipChannel struct {
diff --git a/router/local_peer.go b/router/local_peer.go
index 183afed5..c0a00f87 100644
--- a/router/local_peer.go
+++ b/router/local_peer.go
@@ -5,8 +5,6 @@ import (
 	"net"
 	"sync"
 	"time"
-
-	. "github.com/weaveworks/weave/common"
 )
 
 type LocalPeer struct {
diff --git a/router/router.go b/router/router.go
index a0cdb35d..3e372ebb 100644
--- a/router/router.go
+++ b/router/router.go
@@ -9,8 +9,6 @@ import (
 	"sync"
 	"syscall"
 	"time"
-
-	. "github.com/weaveworks/weave/common"
 )
 
 const (
diff --git a/router/udp_sender.go b/router/udp_sender.go
index bbc89e14..adf052e6 100644
--- a/router/udp_sender.go
+++ b/router/udp_sender.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
-	. "github.com/weaveworks/weave/common"
 )
 
 type UDPSender interface {
diff --git a/router/utils.go b/router/utils.go
index 8b56e810..d9d3cd74 100644
--- a/router/utils.go
+++ b/router/utils.go
@@ -7,9 +7,11 @@ import (
 	"fmt"
 	"net"
 
-	. "github.com/weaveworks/weave/common"
+	"github.com/weaveworks/weave/common"
 )
 
+var Log = common.Log
+
 var void = struct{}{}
 
 func checkFatal(e error) {