diff --git a/actions/fetch.go b/actions/fetch.go index 1cabf44b..25406e25 100644 --- a/actions/fetch.go +++ b/actions/fetch.go @@ -11,8 +11,8 @@ import ( "time" sq "github.com/Masterminds/squirrel" + "github.com/interline-io/log" "github.com/interline-io/transitland-lib/dmfr/fetch" - "github.com/interline-io/transitland-lib/log" "github.com/interline-io/transitland-lib/rt/pb" "github.com/interline-io/transitland-lib/tl/tt" "github.com/interline-io/transitland-lib/tldb" diff --git a/cmd/tlserver/main.go b/cmd/tlserver/main.go index f2e273a9..f138816d 100644 --- a/cmd/tlserver/main.go +++ b/cmd/tlserver/main.go @@ -4,11 +4,11 @@ import ( "flag" "os" + "github.com/interline-io/log" "github.com/interline-io/transitland-lib/dmfr/fetch" "github.com/interline-io/transitland-lib/dmfr/importer" "github.com/interline-io/transitland-lib/dmfr/sync" "github.com/interline-io/transitland-lib/dmfr/unimporter" - "github.com/interline-io/transitland-lib/log" "github.com/interline-io/transitland-lib/tl" "github.com/interline-io/transitland-server/server" ) diff --git a/finders/dbfinder/feed_select.go b/finders/dbfinder/feed_select.go index dc4fd407..ba424c60 100644 --- a/finders/dbfinder/feed_select.go +++ b/finders/dbfinder/feed_select.go @@ -2,7 +2,7 @@ package dbfinder import ( sq "github.com/Masterminds/squirrel" - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" "github.com/interline-io/transitland-server/model" ) diff --git a/finders/dbfinder/feed_version_select.go b/finders/dbfinder/feed_version_select.go index d6035aeb..5ef0a73e 100644 --- a/finders/dbfinder/feed_version_select.go +++ b/finders/dbfinder/feed_version_select.go @@ -2,7 +2,7 @@ package dbfinder import ( sq "github.com/Masterminds/squirrel" - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" "github.com/interline-io/transitland-lib/tl/tt" "github.com/interline-io/transitland-server/model" ) diff --git a/finders/dbfinder/finder.go b/finders/dbfinder/finder.go index ea64c7af..ca0f05e3 100644 --- a/finders/dbfinder/finder.go +++ b/finders/dbfinder/finder.go @@ -7,7 +7,7 @@ import ( "time" sq "github.com/Masterminds/squirrel" - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" "github.com/interline-io/transitland-lib/tl" "github.com/interline-io/transitland-lib/tl/tt" "github.com/interline-io/transitland-mw/auth/authz" diff --git a/finders/rtfinder/finder.go b/finders/rtfinder/finder.go index f0e44e37..7f9df743 100644 --- a/finders/rtfinder/finder.go +++ b/finders/rtfinder/finder.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" "github.com/interline-io/transitland-lib/rt/pb" "github.com/interline-io/transitland-server/internal/clock" "github.com/interline-io/transitland-server/model" diff --git a/finders/rtfinder/lookup.go b/finders/rtfinder/lookup.go index ed3007bb..edb1e7b3 100644 --- a/finders/rtfinder/lookup.go +++ b/finders/rtfinder/lookup.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" "github.com/jmoiron/sqlx" ) diff --git a/finders/rtfinder/redis.go b/finders/rtfinder/redis.go index 7d05b2a2..709c9cc4 100644 --- a/finders/rtfinder/redis.go +++ b/finders/rtfinder/redis.go @@ -7,7 +7,7 @@ import ( "time" "github.com/go-redis/redis/v8" - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" "github.com/interline-io/transitland-lib/rt/pb" ) diff --git a/finders/rtfinder/source.go b/finders/rtfinder/source.go index 93027595..0b670b2c 100644 --- a/finders/rtfinder/source.go +++ b/finders/rtfinder/source.go @@ -1,7 +1,7 @@ package rtfinder import ( - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" "github.com/interline-io/transitland-lib/rt/pb" "google.golang.org/protobuf/proto" ) diff --git a/go.mod b/go.mod index b388237e..e9aabaf4 100644 --- a/go.mod +++ b/go.mod @@ -79,6 +79,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/golang-lru/v2 v2.0.1 // indirect github.com/iancoleman/orderedmap v0.2.0 // indirect + github.com/interline-io/log v0.0.0-20231211003339-8bdc406adcd2 // indirect github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect github.com/jlaffaye/ftp v0.1.0 // indirect github.com/kylelemons/godebug v1.1.0 // indirect diff --git a/go.sum b/go.sum index 0b89fb39..5056cfc0 100644 --- a/go.sum +++ b/go.sum @@ -28,6 +28,7 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/Masterminds/squirrel v1.5.4 h1:uUcX/aBc8O7Fg9kaISIUsHXdKuqehiXAMQTYX8afzqM= github.com/Masterminds/squirrel v1.5.4/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10= +github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/rehttp v1.3.0 h1:w54Pb72MQn2eJrSdPsvGqXlAfiK1+NMTGDrOJJ4YvSU= github.com/PuerkitoBio/rehttp v1.3.0/go.mod h1:LUwKPoDbDIA2RL5wYZCNsQ90cx4OJ4AWBmq6KzWZL1s= @@ -132,6 +133,8 @@ github.com/digitalocean/go-workers2 v0.10.3/go.mod h1:4F0tUdjgqV9ZOGCTmn5Cr58CVs github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U= github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE= github.com/dnaeon/go-vcr v1.1.0 h1:ReYa/UBrRyQdant9B4fNHGoCNKw6qh6P0fsdGmZpR7c= +github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= @@ -158,6 +161,7 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-redis/redis/v8 v8.4.4/go.mod h1:nA0bQuF0i5JFx4Ta9RZxGKXFrQ8cRWntra97f0196iY= github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= @@ -168,6 +172,7 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= @@ -254,6 +259,8 @@ github.com/hypirion/go-filecache v0.0.0-20160810125507-e3e6ef6981f0/go.mod h1:OA github.com/iancoleman/orderedmap v0.2.0 h1:sq1N/TFpYH++aViPcaKjys3bDClUEU7s5B+z6jq8pNA= github.com/iancoleman/orderedmap v0.2.0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/interline-io/log v0.0.0-20231211003339-8bdc406adcd2 h1:ScRM8Kr6UwAvblyGMdupRwEy7eWCROPLWmGJf1J1aOk= +github.com/interline-io/log v0.0.0-20231211003339-8bdc406adcd2/go.mod h1:chJaM8SKcHI6ivoeFuZ8M8axTjSV4TPmuQ+sAyAHa34= github.com/interline-io/transitland-lib v0.14.0-rc1.0.20231202005632-a9ea742322f7 h1:rwkKzYzl05Q4TM++L9RIJbXPjIvURoMN5vEr8dvUV/Q= github.com/interline-io/transitland-lib v0.14.0-rc1.0.20231202005632-a9ea742322f7/go.mod h1:UcfuCX6DyKt/yn5GECFn3jQ6NcZEjt5XyPjf8a3tXZ4= github.com/interline-io/transitland-mw v0.0.0-20231209013116-a1adf6a31e93 h1:qurYqyKQAGTtjNyAlGyrNGvZ9TFBcEwwo0X7Tq8XuFU= @@ -276,10 +283,13 @@ github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Cc github.com/joeshaw/gengen v0.0.0-20190604015154-c77d87825f5a/go.mod h1:v2qvRL8Xwk4OlARK6gPlf2JreZXzv0dYp/8+kUJ0y7Q= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -329,7 +339,9 @@ github.com/mmcloughlin/geohash v0.10.0 h1:9w1HchfDfdeLc+jFEf/04D27KP7E2QmpDu52wP github.com/mmcloughlin/geohash v0.10.0/go.mod h1:oNZxQo5yWJh0eMQEP/8hwQuVx9Z9tjwFUqcTB1SmG0c= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.6/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= @@ -402,6 +414,7 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= diff --git a/internal/dbutil/dbutil.go b/internal/dbutil/dbutil.go index c3e270da..d488f893 100644 --- a/internal/dbutil/dbutil.go +++ b/internal/dbutil/dbutil.go @@ -8,7 +8,7 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" "github.com/interline-io/transitland-lib/tldb" "github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx/reflectx" diff --git a/internal/directions/aws_router.go b/internal/directions/aws_router.go index d961e136..b4c09559 100644 --- a/internal/directions/aws_router.go +++ b/internal/directions/aws_router.go @@ -10,7 +10,7 @@ import ( awsconfig "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/location" "github.com/aws/aws-sdk-go-v2/service/location/types" - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" "github.com/interline-io/transitland-lib/tl" "github.com/interline-io/transitland-lib/tl/tt" "github.com/interline-io/transitland-server/internal/clock" diff --git a/internal/directions/directions.go b/internal/directions/directions.go index b2a9f720..1316a848 100644 --- a/internal/directions/directions.go +++ b/internal/directions/directions.go @@ -6,7 +6,7 @@ import ( "os" "sync" - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" "github.com/interline-io/transitland-server/model" ) diff --git a/internal/directions/valhalla_router.go b/internal/directions/valhalla_router.go index 3a8b418d..26230e23 100644 --- a/internal/directions/valhalla_router.go +++ b/internal/directions/valhalla_router.go @@ -11,7 +11,7 @@ import ( "time" "github.com/aws/aws-sdk-go/aws" - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" "github.com/interline-io/transitland-lib/tl/tt" "github.com/interline-io/transitland-server/internal/clock" "github.com/interline-io/transitland-server/internal/httpcache" diff --git a/internal/ecache/ecache.go b/internal/ecache/ecache.go index cfc3a000..90e7f001 100644 --- a/internal/ecache/ecache.go +++ b/internal/ecache/ecache.go @@ -8,7 +8,7 @@ import ( "time" "github.com/go-redis/redis/v8" - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" ) type Item[T any] struct { diff --git a/internal/gbfs/fetch.go b/internal/gbfs/fetch.go index 9a217613..15491d73 100644 --- a/internal/gbfs/fetch.go +++ b/internal/gbfs/fetch.go @@ -3,9 +3,9 @@ package gbfs import ( "encoding/json" + "github.com/interline-io/log" "github.com/interline-io/transitland-lib/dmfr" "github.com/interline-io/transitland-lib/dmfr/fetch" - "github.com/interline-io/transitland-lib/log" "github.com/interline-io/transitland-lib/tl/request" "github.com/interline-io/transitland-lib/tl/tt" "github.com/interline-io/transitland-lib/tldb" diff --git a/internal/jobs/local_jobs.go b/internal/jobs/local_jobs.go index 78180f24..3291ddc5 100644 --- a/internal/jobs/local_jobs.go +++ b/internal/jobs/local_jobs.go @@ -8,7 +8,7 @@ import ( "sync/atomic" "time" - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" ) var jobCounter = uint64(0) diff --git a/internal/jobs/log.go b/internal/jobs/log.go index b451a3b1..c5391652 100644 --- a/internal/jobs/log.go +++ b/internal/jobs/log.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" ) type jlog struct { diff --git a/internal/jobs/redis_jobs.go b/internal/jobs/redis_jobs.go index 424b6737..59743041 100644 --- a/internal/jobs/redis_jobs.go +++ b/internal/jobs/redis_jobs.go @@ -11,7 +11,7 @@ import ( workers "github.com/digitalocean/go-workers2" "github.com/go-redis/redis/v8" - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" ) // RedisJobs is a simple wrapper around go-workers diff --git a/internal/testutil/db.go b/internal/testutil/db.go index 3097844a..de7d9035 100644 --- a/internal/testutil/db.go +++ b/internal/testutil/db.go @@ -5,7 +5,7 @@ import ( "os" "github.com/go-redis/redis/v8" - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" "github.com/interline-io/transitland-server/internal/dbutil" "github.com/jmoiron/sqlx" ) diff --git a/internal/testutil/recorder.go b/internal/testutil/recorder.go index 2927a424..31ace8e2 100644 --- a/internal/testutil/recorder.go +++ b/internal/testutil/recorder.go @@ -6,7 +6,7 @@ import ( "net/http" "net/url" - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" "gopkg.in/dnaeon/go-vcr.v2/cassette" "gopkg.in/dnaeon/go-vcr.v2/recorder" ) diff --git a/server/gql/fvsl_cache.go b/server/gql/fvsl_cache.go index 09c3ca29..9c21b3b4 100644 --- a/server/gql/fvsl_cache.go +++ b/server/gql/fvsl_cache.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" "github.com/interline-io/transitland-server/model" ) diff --git a/server/gql/loaders.go b/server/gql/loaders.go index 22893d65..2a6013ec 100644 --- a/server/gql/loaders.go +++ b/server/gql/loaders.go @@ -7,7 +7,7 @@ import ( "time" dataloader "github.com/graph-gophers/dataloader/v7" - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" "github.com/interline-io/transitland-lib/tl/tt" "github.com/interline-io/transitland-server/config" "github.com/interline-io/transitland-server/model" diff --git a/server/rest/filecache.go b/server/rest/filecache.go index ae4a0c49..3a61b861 100644 --- a/server/rest/filecache.go +++ b/server/rest/filecache.go @@ -5,7 +5,7 @@ import ( "os" "github.com/hypirion/go-filecache" - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" ) // local file cache diff --git a/server/rest/map.go b/server/rest/map.go index bd6d855e..dd62cedc 100644 --- a/server/rest/map.go +++ b/server/rest/map.go @@ -8,7 +8,7 @@ import ( sm "github.com/flopp/go-staticmaps" "github.com/golang/geo/s2" - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" "github.com/twpayne/go-geom" "github.com/twpayne/go-geom/encoding/geojson" ) diff --git a/server/rest/rest.go b/server/rest/rest.go index 6988eefb..8838ae2e 100644 --- a/server/rest/rest.go +++ b/server/rest/rest.go @@ -14,7 +14,7 @@ import ( "strings" "github.com/go-chi/chi/v5" - "github.com/interline-io/transitland-lib/log" + "github.com/interline-io/log" "github.com/interline-io/transitland-mw/auth/ancheck" "github.com/interline-io/transitland-mw/meters" "github.com/interline-io/transitland-server/config" diff --git a/server/server_cmd.go b/server/server_cmd.go index b1e1c439..af31472a 100644 --- a/server/server_cmd.go +++ b/server/server_cmd.go @@ -20,8 +20,8 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/cors" "github.com/go-redis/redis/v8" + "github.com/interline-io/log" "github.com/interline-io/transitland-lib/dmfr" - "github.com/interline-io/transitland-lib/log" "github.com/interline-io/transitland-lib/tl" "github.com/interline-io/transitland-mw/auth/ancheck" "github.com/interline-io/transitland-mw/auth/azcheck"