diff --git a/logging/adapters/stdlib/capture.go b/logging/adapters/stdlib/capture.go index f3729f36d307444f0c316dd69df2a129a91fafb3..5e8670f2266ac08129b02db09d3e3810373ae0d2 100644 --- a/logging/adapters/stdlib/capture.go +++ b/logging/adapters/stdlib/capture.go @@ -18,8 +18,8 @@ import ( "io" "log" - "github.com/monax/eris-db/logging/loggers" kitlog "github.com/go-kit/kit/log" + "github.com/monax/eris-db/logging/loggers" ) func Capture(stdLibLogger log.Logger, diff --git a/logging/adapters/tendermint_log15/capture.go b/logging/adapters/tendermint_log15/capture.go index bc54b4b067cfd00ae6349e5eced1ecdfd1d96129..46053ae4722894a6823cc53a69ab23d475c63625 100644 --- a/logging/adapters/tendermint_log15/capture.go +++ b/logging/adapters/tendermint_log15/capture.go @@ -15,8 +15,8 @@ package adapters import ( - "github.com/monax/eris-db/logging/loggers" kitlog "github.com/go-kit/kit/log" + "github.com/monax/eris-db/logging/loggers" "github.com/tendermint/log15" ) diff --git a/logging/adapters/tendermint_log15/convert.go b/logging/adapters/tendermint_log15/convert.go index 0b56999e17b416f441d30953a57943fc94c55b96..f30f36e0e39049f51816ab4d881ee80db9e06ee8 100644 --- a/logging/adapters/tendermint_log15/convert.go +++ b/logging/adapters/tendermint_log15/convert.go @@ -17,10 +17,10 @@ package adapters import ( "time" + "github.com/go-stack/stack" "github.com/monax/eris-db/logging/loggers" "github.com/monax/eris-db/logging/structure" . "github.com/monax/eris-db/util/slice" - "github.com/go-stack/stack" "github.com/tendermint/log15" ) diff --git a/logging/convention.go b/logging/convention.go index 2e065426e9e72478cca029798305e50e12def32c..230e4ed9ec5127cc2f6c07da68c4327083f1d72f 100644 --- a/logging/convention.go +++ b/logging/convention.go @@ -15,10 +15,10 @@ package logging import ( + kitlog "github.com/go-kit/kit/log" "github.com/monax/eris-db/logging/loggers" "github.com/monax/eris-db/logging/structure" "github.com/monax/eris-db/util/slice" - kitlog "github.com/go-kit/kit/log" ) // Helper functions for InfoTraceLoggers, sort of extension methods to loggers diff --git a/logging/loggers/info_trace_logger.go b/logging/loggers/info_trace_logger.go index 8f36280082a53f640bf17b623c223d954c1058c4..9cba501e2df1c556aed194fc94437d51232eeb5e 100644 --- a/logging/loggers/info_trace_logger.go +++ b/logging/loggers/info_trace_logger.go @@ -15,8 +15,8 @@ package loggers import ( - "github.com/monax/eris-db/logging/structure" kitlog "github.com/go-kit/kit/log" + "github.com/monax/eris-db/logging/structure" ) const ( diff --git a/logging/loggers/multiple_channel_logger.go b/logging/loggers/multiple_channel_logger.go index d3d2b956b2c2ead79c2fb0495ce26d0e7324f840..348d2c3cfa917b61c485417db8dea84b9bd979af 100644 --- a/logging/loggers/multiple_channel_logger.go +++ b/logging/loggers/multiple_channel_logger.go @@ -17,8 +17,8 @@ package loggers import ( "fmt" - "github.com/monax/eris-db/logging/structure" kitlog "github.com/go-kit/kit/log" + "github.com/monax/eris-db/logging/structure" ) // This represents a 'SELECT ONE' type logger. When logged to it will search diff --git a/logging/loggers/multiple_channel_logger_test.go b/logging/loggers/multiple_channel_logger_test.go index 307a2371facc0cfcd9f1191fa9caf6e0dfb70020..de5f779ac5ee96c9e19ac077065505e5fe615b09 100644 --- a/logging/loggers/multiple_channel_logger_test.go +++ b/logging/loggers/multiple_channel_logger_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - "github.com/monax/eris-db/logging/structure" kitlog "github.com/go-kit/kit/log" + "github.com/monax/eris-db/logging/structure" "github.com/stretchr/testify/assert" ) diff --git a/logging/loggers/vector_valued_logger.go b/logging/loggers/vector_valued_logger.go index 2a77bed2bf0b167c5392a53fa45ab06be07ad0ef..6d693d48c11149d18ea6ae173bcae23a552f053a 100644 --- a/logging/loggers/vector_valued_logger.go +++ b/logging/loggers/vector_valued_logger.go @@ -15,8 +15,8 @@ package loggers import ( - "github.com/monax/eris-db/logging/structure" kitlog "github.com/go-kit/kit/log" + "github.com/monax/eris-db/logging/structure" ) // Treat duplicate key-values as consecutive entries in a vector-valued lookup diff --git a/logging/metadata.go b/logging/metadata.go index 128ceb891d41e0ea76ee7b72421e649836175129..d82ca2e265e596d0af86a7dfd16561b43c526b29 100644 --- a/logging/metadata.go +++ b/logging/metadata.go @@ -17,10 +17,10 @@ package logging import ( "time" - "github.com/monax/eris-db/logging/loggers" - "github.com/monax/eris-db/logging/structure" kitlog "github.com/go-kit/kit/log" "github.com/go-stack/stack" + "github.com/monax/eris-db/logging/loggers" + "github.com/monax/eris-db/logging/structure" ) const ( diff --git a/logging/terminal.go b/logging/terminal.go index fcd1f1b0ecb957b012c00d145792e54692ab3aab..24747c5209233669a8d4c803beeb5e783bfb92dd 100644 --- a/logging/terminal.go +++ b/logging/terminal.go @@ -15,8 +15,8 @@ package logging import ( - "github.com/monax/eris-db/logging/structure" "github.com/go-kit/kit/log/term" + "github.com/monax/eris-db/logging/structure" ) func Colors(keyvals ...interface{}) term.FgBgColor { diff --git a/rpc/v0/restServer_test.go b/rpc/v0/restServer_test.go index a5d73135095556d7579560ae8059e6eb0db68ffd..6519bcf469dd68de3f6c81b1e0f0d09efa041c23 100644 --- a/rpc/v0/restServer_test.go +++ b/rpc/v0/restServer_test.go @@ -32,8 +32,8 @@ import ( server "github.com/monax/eris-db/server" "github.com/monax/eris-db/txs" - "github.com/monax/eris-db/rpc/v0/shared" "github.com/gin-gonic/gin" + "github.com/monax/eris-db/rpc/v0/shared" "github.com/stretchr/testify/suite" "github.com/tendermint/log15" ) diff --git a/test/server/scumbag.go b/test/server/scumbag.go index c4cfae6a368ae7b3ecd8f936e943feec5fcae0e7..4810ba2c88598fd761f44c2fb645ef66ffe1318e 100644 --- a/test/server/scumbag.go +++ b/test/server/scumbag.go @@ -19,9 +19,9 @@ import ( "os" "runtime" + "github.com/gin-gonic/gin" rpc "github.com/monax/eris-db/rpc" "github.com/monax/eris-db/server" - "github.com/gin-gonic/gin" "github.com/tendermint/log15" )