Skip to content

Commit 26065ea

Browse files
committed
all: remove temporary deadlock detection
1 parent 027e9da commit 26065ea

File tree

8 files changed

+6
-15
lines changed

8 files changed

+6
-15
lines changed

go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ require (
88
github.com/gabriel-vasile/mimetype v1.4.5
99
github.com/google/uuid v1.6.0
1010
github.com/rs/zerolog v1.33.0
11-
github.com/sasha-s/go-deadlock v0.3.5
1211
github.com/stretchr/testify v1.9.0
1312
go.mau.fi/util v0.7.1-0.20240913091524-7617daa66719
1413
golang.org/x/crypto v0.27.0

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
4848
github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
4949
github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
5050
github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
51-
github.com/sasha-s/go-deadlock v0.3.5 h1:tNCOEEDG6tBqrNDOX35j/7hL5FcFViG6awUGROb2NsU=
52-
github.com/sasha-s/go-deadlock v0.3.5/go.mod h1:bugP6EGbdGYObIlx7pUZtWqlvo8k9H6vCBBsiChJQ5U=
5351
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
5452
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
5553
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=

pkg/connector/client.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@ package connector
1919
import (
2020
"context"
2121
"errors"
22+
"sync"
2223
"sync/atomic"
2324
"time"
2425

25-
sync "github.com/sasha-s/go-deadlock"
26-
2726
"github.com/rs/zerolog"
2827
"go.mau.fi/util/exsync"
2928
"maunium.net/go/mautrix/bridge/status"

pkg/connector/dbmeta.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ import (
2020
"encoding/json"
2121
"fmt"
2222
"slices"
23-
24-
sync "github.com/sasha-s/go-deadlock"
23+
"sync"
2524

2625
"go.mau.fi/util/jsontime"
2726
"maunium.net/go/mautrix/bridgev2/database"

pkg/libgm/client.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ import (
99
"net"
1010
"net/http"
1111
"net/url"
12+
"sync"
1213
"sync/atomic"
1314
"time"
1415

15-
sync "github.com/sasha-s/go-deadlock"
16-
1716
"github.com/google/uuid"
1817
"github.com/rs/zerolog"
1918

pkg/libgm/longpoll.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@ import (
1010
"fmt"
1111
"io"
1212
"net/http"
13+
"sync"
1314
"sync/atomic"
1415
"time"
1516

16-
sync "github.com/sasha-s/go-deadlock"
17-
1817
"github.com/google/uuid"
1918
"github.com/rs/zerolog"
2019
"go.mau.fi/util/pblite"

pkg/libgm/pair_google.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@ import (
3232
"slices"
3333
"strconv"
3434
"strings"
35+
"sync"
3536
"time"
3637

37-
sync "github.com/sasha-s/go-deadlock"
38-
3938
"github.com/google/uuid"
4039
"github.com/rs/zerolog"
4140
"go.mau.fi/util/exslices"

pkg/libgm/session_handler.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ package libgm
33
import (
44
"encoding/base64"
55
"fmt"
6+
"sync"
67
"time"
78

8-
sync "github.com/sasha-s/go-deadlock"
9-
109
"github.com/google/uuid"
1110
"github.com/rs/zerolog"
1211
"golang.org/x/exp/slices"

0 commit comments

Comments
 (0)