Move log into common

xujie-nm · Sep 19, 2015 · a887fd0 · a887fd0
1 parent d03cac9
commit a887fd0
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 20 deletions.
diff --git a/common/io/encryption.go b/common/io/encryption.go
@@ -4,7 +4,7 @@ import (
 	"crypto/cipher"
 	"io"
 
-	"github.com/v2ray/v2ray-core/log"
+	"github.com/v2ray/v2ray-core/common/log"
 )
 
 // CryptionReader is a general purpose reader that applies

diff --git a/log/log.go → common/log/log.go b/log/log.go → common/log/log.go
diff --git a/config/json/json.go b/config/json/json.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 
 	"github.com/v2ray/v2ray-core"
-	"github.com/v2ray/v2ray-core/log"
+	"github.com/v2ray/v2ray-core/common/log"
 )
 
 type ConnectionConfig struct {

diff --git a/point.go b/point.go
@@ -1,8 +1,8 @@
 package core
 
 import (
+	"github.com/v2ray/v2ray-core/common/log"
 	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/log"
 )
 
 var (

diff --git a/proxy/freedom/freedom.go b/proxy/freedom/freedom.go
@@ -4,8 +4,8 @@ import (
 	"net"
 
 	"github.com/v2ray/v2ray-core"
+	"github.com/v2ray/v2ray-core/common/log"
 	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/log"
 )
 
 type FreedomConnection struct {

diff --git a/proxy/socks/protocol/socks.go b/proxy/socks/protocol/socks.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"io"
 
+	"github.com/v2ray/v2ray-core/common/log"
 	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/log"
 )
 
 const (

diff --git a/proxy/socks/socks.go b/proxy/socks/socks.go
@@ -8,8 +8,8 @@ import (
 	"strconv"
 
 	"github.com/v2ray/v2ray-core"
+	"github.com/v2ray/v2ray-core/common/log"
 	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/log"
 	protocol "github.com/v2ray/v2ray-core/proxy/socks/protocol"
 )
 

diff --git a/proxy/vmess/config.go b/proxy/vmess/config.go
@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 	"net"
 
+	"github.com/v2ray/v2ray-core/common/log"
 	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/log"
-  "github.com/v2ray/v2ray-core/proxy/vmess/protocol/user"
+	"github.com/v2ray/v2ray-core/proxy/vmess/protocol/user"
 )
 
 type VMessUser struct {

diff --git a/proxy/vmess/protocol/user/id.go b/proxy/vmess/protocol/user/id.go
@@ -4,7 +4,7 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 
-	"github.com/v2ray/v2ray-core/log"
+	"github.com/v2ray/v2ray-core/common/log"
 )
 
 const (

diff --git a/proxy/vmess/protocol/user/userset.go b/proxy/vmess/protocol/user/userset.go
@@ -4,7 +4,7 @@ import (
 	"container/heap"
 	"time"
 
-	"github.com/v2ray/v2ray-core/log"
+	"github.com/v2ray/v2ray-core/common/log"
 )
 
 const (

diff --git a/proxy/vmess/protocol/vmess.go b/proxy/vmess/protocol/vmess.go
@@ -13,9 +13,9 @@ import (
 	"time"
 
 	v2io "github.com/v2ray/v2ray-core/common/io"
+	"github.com/v2ray/v2ray-core/common/log"
 	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/log"
-  "github.com/v2ray/v2ray-core/proxy/vmess/protocol/user"
+	"github.com/v2ray/v2ray-core/proxy/vmess/protocol/user"
 )
 
 const (

diff --git a/proxy/vmess/protocol/vmess_test.go b/proxy/vmess/protocol/vmess_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	v2net "github.com/v2ray/v2ray-core/common/net"
-  	"github.com/v2ray/v2ray-core/proxy/vmess/protocol/user"
+	"github.com/v2ray/v2ray-core/proxy/vmess/protocol/user"
 	"github.com/v2ray/v2ray-core/testing/mocks"
 	"github.com/v2ray/v2ray-core/testing/unit"
 )

diff --git a/proxy/vmess/vmessin.go b/proxy/vmess/vmessin.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/v2ray/v2ray-core"
 	v2io "github.com/v2ray/v2ray-core/common/io"
+	"github.com/v2ray/v2ray-core/common/log"
 	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/log"
 	"github.com/v2ray/v2ray-core/proxy/vmess/protocol"
-  "github.com/v2ray/v2ray-core/proxy/vmess/protocol/user"
+	"github.com/v2ray/v2ray-core/proxy/vmess/protocol/user"
 )
 
 type VMessInboundHandler struct {

diff --git a/proxy/vmess/vmessout.go b/proxy/vmess/vmessout.go
@@ -9,16 +9,16 @@ import (
 
 	"github.com/v2ray/v2ray-core"
 	v2io "github.com/v2ray/v2ray-core/common/io"
+	"github.com/v2ray/v2ray-core/common/log"
 	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/log"
 	"github.com/v2ray/v2ray-core/proxy/vmess/protocol"
-  "github.com/v2ray/v2ray-core/proxy/vmess/protocol/user"
+	"github.com/v2ray/v2ray-core/proxy/vmess/protocol/user"
 )
 
 // VNext is the next Point server in the connection chain.
 type VNextServer struct {
-	Address v2net.Address   // Address of VNext server
-	Users   []user.User // User accounts for accessing VNext.
+	Address v2net.Address // Address of VNext server
+	Users   []user.User   // User accounts for accessing VNext.
 }
 
 type VMessOutboundHandler struct {

diff --git a/release/server/main.go b/release/server/main.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/v2ray/v2ray-core"
+	"github.com/v2ray/v2ray-core/common/log"
 	jsonconf "github.com/v2ray/v2ray-core/config/json"
-	"github.com/v2ray/v2ray-core/log"
 
 	// The following are neccesary as they register handlers in their init functions.
 	_ "github.com/v2ray/v2ray-core/proxy/freedom"
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,8 +6,8 @@ import ( @@
     	"fmt"
     	"io"
+    	"github.com/v2ray/v2ray-core/common/log"
     	v2net "github.com/v2ray/v2ray-core/common/net"
-    	"github.com/v2ray/v2ray-core/log"
     )
     const (
@@ Expand Down @@