diff --git a/common/config.go b/common/config.go index 7cb0208..683f90d 100644 --- a/common/config.go +++ b/common/config.go @@ -4,7 +4,7 @@ import ( "encoding/xml" "os" - "github.com/sasha-s/go-deadlock" + "github.com/linkdata/deadlock" ) type Config struct { diff --git a/gamestats/main.go b/gamestats/main.go index 59c5942..e8efd69 100644 --- a/gamestats/main.go +++ b/gamestats/main.go @@ -12,8 +12,8 @@ import ( "wwfc/logging" "github.com/jackc/pgx/v4/pgxpool" + "github.com/linkdata/deadlock" "github.com/logrusorgru/aurora/v3" - "github.com/sasha-s/go-deadlock" ) var ServerName = "gamestats" diff --git a/go.mod b/go.mod index 6952494..f4f7d24 100644 --- a/go.mod +++ b/go.mod @@ -7,11 +7,8 @@ toolchain go1.24.2 require ( github.com/jackc/pgx/v4 v4.18.3 github.com/logrusorgru/aurora/v3 v3.0.0 - github.com/sasha-s/go-deadlock v0.3.5 golang.org/x/net v0.47.0 -) - -require ( + github.com/linkdata/deadlock v0.5.5 // indirect github.com/jackc/chunkreader/v2 v2.0.1 // indirect github.com/jackc/pgconn v1.14.3 // indirect github.com/jackc/pgio v1.0.0 // indirect @@ -20,7 +17,7 @@ require ( github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/jackc/pgtype v1.14.4 // indirect github.com/jackc/puddle v1.3.0 // indirect - github.com/petermattis/goid v0.0.0-20250508124226-395b08cebbdb // indirect + github.com/petermattis/goid v0.0.0-20250813065127-a731cc31b4fe // indirect golang.org/x/crypto v0.45.0 // indirect golang.org/x/text v0.31.0 // indirect gvisor.dev/gvisor v0.0.0-20250512220230-2268d0cbb0f5 diff --git a/go.sum b/go.sum index 2e942d8..ec84af6 100644 --- a/go.sum +++ b/go.sum @@ -78,6 +78,8 @@ github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/linkdata/deadlock v0.5.5 h1:d6O+rzEqasSfamGDA8u7bjtaq7hOX8Ha4Zn36Wxrkvo= +github.com/linkdata/deadlock v0.5.5/go.mod h1:tXb28stzAD3trzEEK0UJWC+rZKuobCoPktPYzebb1u0= github.com/logrusorgru/aurora/v3 v3.0.0 h1:R6zcoZZbvVcGMvDCKo45A9U/lzYyzl5NfYIvznmDfE4= github.com/logrusorgru/aurora/v3 v3.0.0/go.mod h1:vsR12bk5grlLvLXAYrBsb5Oc/N+LxAlxggSjiwMnCUc= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= @@ -88,6 +90,8 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/petermattis/goid v0.0.0-20250508124226-395b08cebbdb h1:3PrKuO92dUTMrQ9dx0YNejC6U/Si6jqKmyQ9vWjwqR4= github.com/petermattis/goid v0.0.0-20250508124226-395b08cebbdb/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= +github.com/petermattis/goid v0.0.0-20250813065127-a731cc31b4fe h1:vHpqOnPlnkba8iSxU4j/CvDSS9J4+F4473esQsYLGoE= +github.com/petermattis/goid v0.0.0-20250813065127-a731cc31b4fe/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -97,8 +101,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= -github.com/sasha-s/go-deadlock v0.3.5 h1:tNCOEEDG6tBqrNDOX35j/7hL5FcFViG6awUGROb2NsU= -github.com/sasha-s/go-deadlock v0.3.5/go.mod h1:bugP6EGbdGYObIlx7pUZtWqlvo8k9H6vCBBsiChJQ5U= +github.com/linkdata/deadlock v0.3.5 h1:tNCOEEDG6tBqrNDOX35j/7hL5FcFViG6awUGROb2NsU= +github.com/linkdata/deadlock v0.3.5/go.mod h1:bugP6EGbdGYObIlx7pUZtWqlvo8k9H6vCBBsiChJQ5U= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= diff --git a/gpcm/main.go b/gpcm/main.go index 6246fc2..1517182 100644 --- a/gpcm/main.go +++ b/gpcm/main.go @@ -12,8 +12,8 @@ import ( "wwfc/qr2" "github.com/jackc/pgx/v4/pgxpool" + "github.com/linkdata/deadlock" "github.com/logrusorgru/aurora/v3" - "github.com/sasha-s/go-deadlock" ) var ServerName = "gpcm" diff --git a/qr2/session.go b/qr2/session.go index 037618e..1d906a9 100644 --- a/qr2/session.go +++ b/qr2/session.go @@ -11,8 +11,8 @@ import ( "wwfc/common" "wwfc/logging" + "github.com/linkdata/deadlock" "github.com/logrusorgru/aurora/v3" - "github.com/sasha-s/go-deadlock" "gvisor.dev/gvisor/pkg/sleep" ) diff --git a/serverbrowser/main.go b/serverbrowser/main.go index d3d1c06..8dbb4aa 100644 --- a/serverbrowser/main.go +++ b/serverbrowser/main.go @@ -7,8 +7,8 @@ import ( "wwfc/common" "wwfc/logging" + "github.com/linkdata/deadlock" "github.com/logrusorgru/aurora/v3" - "github.com/sasha-s/go-deadlock" ) var ServerName = "serverbrowser"