From 257607a26fbb391b0ff52a80863480e74147ff9d Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Wed, 8 May 2019 21:03:54 +0000 Subject: [PATCH] use my logger instead of seelog --- go.mod | 8 ++++---- go.sum | 15 +++++---------- src/comm/comm_test.go | 2 +- src/croc/croc.go | 9 ++++----- src/croc/croc_test.go | 2 +- src/logger/logger.go | 43 ------------------------------------------ src/message/message.go | 2 +- src/tcp/tcp.go | 5 ++--- 8 files changed, 18 insertions(+), 68 deletions(-) delete mode 100644 src/logger/logger.go diff --git a/go.mod b/go.mod index ccc17a3..c6d94bc 100644 --- a/go.mod +++ b/go.mod @@ -1,14 +1,16 @@ module github.com/schollz/croc/v6 +go 1.12 + require ( github.com/cespare/xxhash v1.1.0 - github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 github.com/denisbrodbeck/machineid v1.0.1 github.com/fatih/color v1.7.0 // indirect github.com/kalafut/imohash v1.0.0 github.com/mattn/go-colorable v0.1.1 // indirect github.com/mattn/go-isatty v0.0.7 // indirect github.com/pkg/errors v0.8.1 + github.com/schollz/logger v0.0.0-20190508205554-e2bba6fcbabd github.com/schollz/mnemonicode v1.0.1 github.com/schollz/pake v1.1.0 github.com/schollz/peerdiscovery v1.4.0 @@ -16,7 +18,5 @@ require ( github.com/schollz/spinner v0.0.0-20180925172146-6bbc5f7804f9 github.com/stretchr/testify v1.3.0 github.com/urfave/cli v1.20.0 - golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 - golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872 // indirect - golang.org/x/text v0.3.2 // indirect + golang.org/x/crypto v0.0.0-20190506204251-e1dfcc566284 ) diff --git a/go.sum b/go.sum index 9a4b783..b41c36f 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,6 @@ github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 h1:kHaBemcxl8o/pQ5VM1c8PVE1PubbNx3mjUr09OqWGCs= -github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575/go.mod h1:9d6lWj8KzO/fd/NrVaLscBKmPigpZpn5YawRPw+e3Yo= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -25,6 +23,8 @@ github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/schollz/logger v0.0.0-20190508205554-e2bba6fcbabd h1:LhOnS7JcUKDc42ngUW6iIu9fuL4xon1bq40L1qaU298= +github.com/schollz/logger v0.0.0-20190508205554-e2bba6fcbabd/go.mod h1:P6F4/dGMGcx8wh+kG1zrNEd4vnNpEBY/mwEMd/vn6AM= github.com/schollz/mnemonicode v1.0.1 h1:LiH5hwADZwjwnfXsaD4xgnMyTAtaKHN+e5AyjRU6WSU= github.com/schollz/mnemonicode v1.0.1/go.mod h1:cl4UAOhUV0mkdjMj/QYaUZbZZdF8BnOqoz8rHMzwboY= github.com/schollz/pake v1.1.0 h1:+tYqsPVkuirFpmeRePjYTUhIHHKLufdmd7QfuspaXCk= @@ -48,22 +48,17 @@ github.com/tscholl2/siec v0.0.0-20180721101609-21667da05937/go.mod h1:KL9+ubr1JZ github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo= -golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190506204251-e1dfcc566284 h1:rlLehGeYg6jfoyz/eDqDU1iRXLKfR42nnNh57ytKEWo= +golang.org/x/crypto v0.0.0-20190506204251-e1dfcc566284/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872 h1:cGjJzUd8RgBw428LXP65YXni0aiGNA4Bl+ls8SmLOm8= -golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= gopkg.in/tylerb/is.v1 v1.1.2 h1:AB/MANFml2ySf+adwcinvajyHvsYltAOD+rb/8njfSU= gopkg.in/tylerb/is.v1 v1.1.2/go.mod h1:9yQB2tyIhZ5oph6Kk5Sq7cJMd9c5Jpa1p3hr9kxzPqo= diff --git a/src/comm/comm_test.go b/src/comm/comm_test.go index 5db5f1a..df90c17 100644 --- a/src/comm/comm_test.go +++ b/src/comm/comm_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - log "github.com/cihub/seelog" + log "github.com/schollz/logger" "github.com/stretchr/testify/assert" ) diff --git a/src/croc/croc.go b/src/croc/croc.go index c80e7c5..14275d1 100644 --- a/src/croc/croc.go +++ b/src/croc/croc.go @@ -17,17 +17,16 @@ import ( "sync" "time" - log "github.com/cihub/seelog" "github.com/denisbrodbeck/machineid" "github.com/pkg/errors" "github.com/schollz/croc/v6/src/comm" "github.com/schollz/croc/v6/src/compress" "github.com/schollz/croc/v6/src/crypt" - "github.com/schollz/croc/v6/src/logger" "github.com/schollz/croc/v6/src/message" "github.com/schollz/croc/v6/src/models" "github.com/schollz/croc/v6/src/tcp" "github.com/schollz/croc/v6/src/utils" + log "github.com/schollz/logger" "github.com/schollz/pake" "github.com/schollz/peerdiscovery" "github.com/schollz/progressbar/v2" @@ -35,14 +34,14 @@ import ( ) func init() { - logger.SetLogLevel("debug") + log.SetLevel("debug") } func Debug(debug bool) { if debug { - logger.SetLogLevel("debug") + log.SetLevel("debug") } else { - logger.SetLogLevel("warn") + log.SetLevel("warn") } } diff --git a/src/croc/croc_test.go b/src/croc/croc_test.go index abea120..95a83c3 100644 --- a/src/croc/croc_test.go +++ b/src/croc/croc_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - log "github.com/cihub/seelog" + log "github.com/schollz/logger" "github.com/schollz/croc/v6/src/tcp" ) diff --git a/src/logger/logger.go b/src/logger/logger.go deleted file mode 100644 index f58743b..0000000 --- a/src/logger/logger.go +++ /dev/null @@ -1,43 +0,0 @@ -package logger - -import ( - log "github.com/cihub/seelog" -) - -// SetLogLevel determines the log level -func SetLogLevel(level string) (err error) { - - // https://en.wikipedia.org/wiki/ANSI_escape_code#3/4_bit - // https://github.com/cihub/seelog/wiki/Log-levels - appConfig := ` - - - - - - - - - - - - - - - - - - - - - - - - ` - logger, err := log.LoggerFromConfigAsBytes([]byte(appConfig)) - if err != nil { - return - } - log.ReplaceLogger(logger) - return -} diff --git a/src/message/message.go b/src/message/message.go index b5e20bc..100456d 100644 --- a/src/message/message.go +++ b/src/message/message.go @@ -3,7 +3,7 @@ package message import ( "encoding/json" - log "github.com/cihub/seelog" + log "github.com/schollz/logger" "github.com/schollz/croc/v6/src/comm" "github.com/schollz/croc/v6/src/compress" "github.com/schollz/croc/v6/src/crypt" diff --git a/src/tcp/tcp.go b/src/tcp/tcp.go index 8c6be1b..74443a0 100644 --- a/src/tcp/tcp.go +++ b/src/tcp/tcp.go @@ -8,11 +8,10 @@ import ( "sync" "time" - log "github.com/cihub/seelog" "github.com/pkg/errors" "github.com/schollz/croc/v6/src/comm" - "github.com/schollz/croc/v6/src/logger" "github.com/schollz/croc/v6/src/models" + log "github.com/schollz/logger" ) type server struct { @@ -46,7 +45,7 @@ func Run(debugLevel, port string, banner ...string) (err error) { } func (s *server) start() (err error) { - logger.SetLogLevel(s.debugLevel) + log.SetLevel(s.debugLevel) s.rooms.Lock() s.rooms.rooms = make(map[string]roomInfo) s.rooms.Unlock()