Move flogging pkg into the peer pkg

yeasy · yeasy · commit 4f7c22caa689 · 2016-12-12T22:36:14.000+08:00
The flogging pkg is only utilized by peer and core module with single
source-code file. It will keep the structure more tight to move the pkg
under the core pkg.

Change-Id: Id47cc1315f845dba625ed0fc61873a41250ff99d
Signed-off-by: Baohua Yang &lt;baohyang@cn.ibm.com&gt;
diff --git a/core/admin.go b/core/admin.go
@@ -25,7 +25,7 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/hyperledger/fabric/flogging"
+	"github.com/hyperledger/fabric/core/flogging"
 	pb "github.com/hyperledger/fabric/protos/peer"
 )
 
diff --git a/core/chaincode/chaincode_support.go b/core/chaincode/chaincode_support.go
@@ -33,8 +33,8 @@ import (
 
 	"github.com/hyperledger/fabric/core/container"
 	"github.com/hyperledger/fabric/core/container/ccintf"
+	"github.com/hyperledger/fabric/core/flogging"
 	"github.com/hyperledger/fabric/core/ledger"
-	"github.com/hyperledger/fabric/flogging"
 	pb "github.com/hyperledger/fabric/protos/peer"
 )
 
diff --git a/core/errors/errors.go b/core/errors/errors.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"runtime"
 
-	"github.com/hyperledger/fabric/flogging"
+	"github.com/hyperledger/fabric/core/flogging"
 	logging "github.com/op/go-logging"
 )
 
diff --git a/core/errors/errors_test.go b/core/errors/errors_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hyperledger/fabric/flogging"
+	"github.com/hyperledger/fabric/core/flogging"
 )
 
 func TestError(t *testing.T) {
diff --git a/core/flogging/logging.go b/core/flogging/logging.go
diff --git a/core/flogging/logging_test.go b/core/flogging/logging_test.go
@@ -19,7 +19,7 @@ package flogging_test
 import (
 	"testing"
 
-	"github.com/hyperledger/fabric/flogging"
+	"github.com/hyperledger/fabric/core/flogging"
 	"github.com/op/go-logging"
 	"github.com/spf13/viper"
 )
diff --git a/peer/common/common.go b/peer/common/common.go
@@ -20,9 +20,9 @@ import (
 	"fmt"
 
 	"github.com/hyperledger/fabric/core/errors"
+	"github.com/hyperledger/fabric/core/flogging"
 	"github.com/hyperledger/fabric/core/peer"
 	"github.com/hyperledger/fabric/core/peer/msp"
-	"github.com/hyperledger/fabric/flogging"
 	"github.com/hyperledger/fabric/msp"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"github.com/spf13/viper"
diff --git a/peer/main.go b/peer/main.go
@@ -31,8 +31,8 @@ import (
 
 	"github.com/hyperledger/fabric/core"
 	"github.com/hyperledger/fabric/core/crypto/primitives"
+	"github.com/hyperledger/fabric/core/flogging"
 	"github.com/hyperledger/fabric/core/peer/msp"
-	"github.com/hyperledger/fabric/flogging"
 	"github.com/hyperledger/fabric/peer/chaincode"
 	"github.com/hyperledger/fabric/peer/clilogging"
 	"github.com/hyperledger/fabric/peer/node"

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`"golang.org/x/net/context"`
`26`	`26`
`27`	`27`	`"github.com/golang/protobuf/ptypes/empty"`
`28`		`- "github.com/hyperledger/fabric/flogging"`
	`28`	`+ "github.com/hyperledger/fabric/core/flogging"`
`29`	`29`	`pb "github.com/hyperledger/fabric/protos/peer"`
`30`	`30`	`)`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ import (`
`33`	`33`
`34`	`34`	`"github.com/hyperledger/fabric/core/container"`
`35`	`35`	`"github.com/hyperledger/fabric/core/container/ccintf"`
	`36`	`+ "github.com/hyperledger/fabric/core/flogging"`
`36`	`37`	`"github.com/hyperledger/fabric/core/ledger"`
`37`		`- "github.com/hyperledger/fabric/flogging"`
`38`	`38`	`pb "github.com/hyperledger/fabric/protos/peer"`
`39`	`39`	`)`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`	`"fmt"`
`23`	`23`	`"runtime"`
`24`	`24`
`25`		`- "github.com/hyperledger/fabric/flogging"`
	`25`	`+ "github.com/hyperledger/fabric/core/flogging"`
`26`	`26`	`logging "github.com/op/go-logging"`
`27`	`27`	`)`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"fmt"`
`21`	`21`	`"testing"`
`22`	`22`
`23`		`- "github.com/hyperledger/fabric/flogging"`
	`23`	`+ "github.com/hyperledger/fabric/core/flogging"`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`func TestError(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ package flogging_test`
`19`	`19`	`import (`
`20`	`20`	`"testing"`
`21`	`21`
`22`		`- "github.com/hyperledger/fabric/flogging"`
	`22`	`+ "github.com/hyperledger/fabric/core/flogging"`
`23`	`23`	`"github.com/op/go-logging"`
`24`	`24`	`"github.com/spf13/viper"`
`25`	`25`	`)`