diff --git a/go.mod b/go.mod index 88ffdc83c..26988c3b3 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/gorilla/mux v1.8.0 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 - github.com/michaelquigley/pfxlog v0.0.0-20190813191113-2be43bd0dccc + github.com/michaelquigley/pfxlog v0.3.1 github.com/openziti/edge v0.17.28 github.com/openziti/fabric v0.15.5 github.com/openziti/foundation v0.14.24 diff --git a/go.sum b/go.sum index af761a0cd..3a2529bbb 100644 --- a/go.sum +++ b/go.sum @@ -378,6 +378,7 @@ github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -422,12 +423,15 @@ github.com/marten-seemann/qtls-go1-15 v0.1.0 h1:i/YPXVxz8q9umso/5y474CNcHmTpA+5D github.com/marten-seemann/qtls-go1-15 v0.1.0/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I= github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= @@ -448,6 +452,10 @@ github.com/michaelquigley/dilithium v0.2.0 h1:JNVb9ckXDTAxYVpPHPzkBuXObh0TYymuZg github.com/michaelquigley/dilithium v0.2.0/go.mod h1:MIqCw2+ObUwmS7G+8N8hWiwNMjItUEBzeTlipmiZqOw= github.com/michaelquigley/pfxlog v0.0.0-20190813191113-2be43bd0dccc h1:PQrqw9XKYcPRI9rKwoGZucMjWvfZpyfb5j8Lc13j8YY= github.com/michaelquigley/pfxlog v0.0.0-20190813191113-2be43bd0dccc/go.mod h1:Z0K0l/NScHvLeGoy4SZTps+ZxGv85ql4AvZqTqOxBY8= +github.com/michaelquigley/pfxlog v0.3.0 h1:rekOTtAL6TwVVuSQ1dlyxvR+nL/2VscvmAcw2Ayk1GA= +github.com/michaelquigley/pfxlog v0.3.0/go.mod h1:pwJmJ9nN787xk9U+0z8/5nP2GMhU6GGCTfgBWGpiXaQ= +github.com/michaelquigley/pfxlog v0.3.1 h1:MwDUlWURv5b8jfAzi2D5tcr8yg3ZDgH2uPI/+faucaQ= +github.com/michaelquigley/pfxlog v0.3.1/go.mod h1:pwJmJ9nN787xk9U+0z8/5nP2GMhU6GGCTfgBWGpiXaQ= github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.35 h1:oTfOaDH+mZkdcgdIjH6yBajRGtIwcwcaR+rt23ZSrJs= @@ -588,6 +596,7 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= @@ -685,6 +694,7 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= +golang.org/x/crypto v0.0.0-20190422183909-d864b10871cd/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/test/multi-conn-test/multi-conn-test.go b/test/multi-conn-test/multi-conn-test.go index b8229d967..dc7f6396b 100644 --- a/test/multi-conn-test/multi-conn-test.go +++ b/test/multi-conn-test/multi-conn-test.go @@ -35,6 +35,7 @@ import ( func init() { pfxlog.Global(logrus.InfoLevel) pfxlog.SetPrefix("github.com/openziti/") + pfxlog.SetDefaultNoColor() } func init() { diff --git a/test/sdk-echo-server/sdk-echo-server.go b/test/sdk-echo-server/sdk-echo-server.go index 44429e3bb..c084aa68a 100644 --- a/test/sdk-echo-server/sdk-echo-server.go +++ b/test/sdk-echo-server/sdk-echo-server.go @@ -31,6 +31,7 @@ import ( func init() { pfxlog.Global(logrus.InfoLevel) pfxlog.SetPrefix("github.com/openziti/") + pfxlog.SetDefaultNoColor() } func init() { diff --git a/test/zapp-fortio-grpc-server/zapp-fortio-grpc-server.go b/test/zapp-fortio-grpc-server/zapp-fortio-grpc-server.go index f9f4afed0..1b42d5b12 100644 --- a/test/zapp-fortio-grpc-server/zapp-fortio-grpc-server.go +++ b/test/zapp-fortio-grpc-server/zapp-fortio-grpc-server.go @@ -36,6 +36,7 @@ import ( func init() { pfxlog.Global(logrus.InfoLevel) pfxlog.SetPrefix("github.com/openziti/") + pfxlog.SetDefaultNoColor() } func init() { diff --git a/ziti-controller/main.go b/ziti-controller/main.go index 40e120170..dc8b4957d 100644 --- a/ziti-controller/main.go +++ b/ziti-controller/main.go @@ -33,6 +33,7 @@ import ( func init() { pfxlog.Global(logrus.InfoLevel) pfxlog.SetPrefix("github.com/openziti/") + pfxlog.SetDefaultNoColor() transport.AddAddressParser(quic.AddressParser{}) transport.AddAddressParser(tls.AddressParser{}) transport.AddAddressParser(tcp.AddressParser{}) diff --git a/ziti-fabric-gw/main.go b/ziti-fabric-gw/main.go index adb4ce260..e647b3fca 100644 --- a/ziti-fabric-gw/main.go +++ b/ziti-fabric-gw/main.go @@ -31,6 +31,7 @@ import ( func init() { pfxlog.Global(logrus.InfoLevel) pfxlog.SetPrefix("github.com/openziti/") + pfxlog.SetDefaultNoColor() transport.AddAddressParser(quic.AddressParser{}) transport.AddAddressParser(tls.AddressParser{}) transport.AddAddressParser(tcp.AddressParser{}) diff --git a/ziti-fabric-test/main.go b/ziti-fabric-test/main.go index d4e95788d..b641e340a 100644 --- a/ziti-fabric-test/main.go +++ b/ziti-fabric-test/main.go @@ -36,6 +36,7 @@ import ( func init() { pfxlog.Global(logrus.InfoLevel) pfxlog.SetPrefix("github.com/openziti/") + pfxlog.SetDefaultNoColor() transport.AddAddressParser(quic.AddressParser{}) transport.AddAddressParser(tls.AddressParser{}) transport.AddAddressParser(tcp.AddressParser{}) diff --git a/ziti-fabric/main.go b/ziti-fabric/main.go index 45c3c0ade..b79e70be3 100644 --- a/ziti-fabric/main.go +++ b/ziti-fabric/main.go @@ -32,6 +32,7 @@ import ( func init() { pfxlog.Global(logrus.InfoLevel) pfxlog.SetPrefix("github.com/openziti/") + pfxlog.SetDefaultNoColor() transport.AddAddressParser(quic.AddressParser{}) transport.AddAddressParser(tls.AddressParser{}) transport.AddAddressParser(tcp.AddressParser{}) diff --git a/ziti-probe/ziti-probe.go b/ziti-probe/ziti-probe.go index dfced05a8..b7d5d1c97 100644 --- a/ziti-probe/ziti-probe.go +++ b/ziti-probe/ziti-probe.go @@ -10,6 +10,7 @@ import ( func init() { pfxlog.Global(logrus.InfoLevel) pfxlog.SetPrefix("github.com/openziti/") + pfxlog.SetDefaultNoColor() } func main() { diff --git a/ziti-router/main.go b/ziti-router/main.go index 271b58bf8..d20203cbd 100644 --- a/ziti-router/main.go +++ b/ziti-router/main.go @@ -33,6 +33,7 @@ import ( func init() { pfxlog.Global(logrus.InfoLevel) pfxlog.SetPrefix("github.com/openziti/") + pfxlog.SetDefaultNoColor() transport.AddAddressParser(quic.AddressParser{}) transport.AddAddressParser(tls.AddressParser{}) transport.AddAddressParser(tcp.AddressParser{}) diff --git a/ziti-tunnel/cmd/ziti-tunnel/main.go b/ziti-tunnel/cmd/ziti-tunnel/main.go index d9831d108..1a6b42f94 100644 --- a/ziti-tunnel/cmd/ziti-tunnel/main.go +++ b/ziti-tunnel/cmd/ziti-tunnel/main.go @@ -26,6 +26,7 @@ import ( func init() { pfxlog.Global(logrus.InfoLevel) pfxlog.SetPrefix("github.com/openziti/") + pfxlog.SetDefaultNoColor() } func main() {