deblan-mirror/nextcloud-spreed-signaling
deblan-mirror/nextcloud-spreed-signaling
1
0
Fork 0
mirror of https://github.com/strukturag/nextcloud-spreed-signaling synced 2024-05-01 21:42:45 +02:00
Code Issues Releases Wiki Activity

Merge pull request #33 from strukturag/lint-cleanup

Browse source 
Various cleanups found by golangci-lint
This commit is contained in:
Joachim Bauch 2020-07-31 15:38:03 +02:00 committed by GitHub
parent 023f2715f5 68477474f8
commit 2278a5ffba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 42 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/server/main.go
View file

@ -288,8 +288,6 @@ func main() {
}
}
select {
case <-interrupt:
log.Println("Interrupted")
}
<-interrupt
log.Println("Interrupted")
}

4
src/signaling/backend_configuration.go
View file

@ -180,9 +180,7 @@ func (b *BackendConfiguration) GetBackend(u *url.URL) *Backend {
func (b *BackendConfiguration) GetBackends() []*Backend {
var result []*Backend
for _, entries := range b.backends {
for _, entry := range entries {
result = append(result, entry)
}
result = append(result, entries...)
}
return result
}

21
src/signaling/backend_server_test.go
View file

@ -1068,11 +1068,13 @@ func TestBackendServer_ParticipantsUpdateTimeout(t *testing.T) {
data, err := json.Marshal(msg)
if err != nil {
t.Fatal(err)
t.Error(err)
return
}
res, err := performBackendRequest(server.URL+"/api/v1/room/"+roomId, data)
if err != nil {
t.Fatal(err)
t.Error(err)
return
}
defer res.Body.Close()
body, err := ioutil.ReadAll(res.Body)
@ -1119,11 +1121,13 @@ func TestBackendServer_ParticipantsUpdateTimeout(t *testing.T) {
data, err := json.Marshal(msg)
if err != nil {
t.Fatal(err)
t.Error(err)
return
}
res, err := performBackendRequest(server.URL+"/api/v1/room/"+roomId, data)
if err != nil {
t.Fatal(err)
t.Error(err)
return
}
defer res.Body.Close()
body, err := ioutil.ReadAll(res.Body)
@ -1136,6 +1140,9 @@ func TestBackendServer_ParticipantsUpdateTimeout(t *testing.T) {
}()
wg.Wait()
if t.Failed() {
return
}
msg1_a, err := client1.RunUntilMessage(ctx)
if err != nil {
@ -1176,8 +1183,7 @@ func TestBackendServer_ParticipantsUpdateTimeout(t *testing.T) {
ctx2, cancel2 := context.WithTimeout(context.Background(), time.Second+100*time.Millisecond)
defer cancel2()
msg1_c, err := client1.RunUntilMessage(ctx2)
if msg1_c != nil {
if msg1_c, _ := client1.RunUntilMessage(ctx2); msg1_c != nil {
if in_call_2, err := checkMessageParticipantsInCall(msg1_c); err != nil {
t.Error(err)
} else if len(in_call_2.Users) != 2 {
@ -1187,8 +1193,7 @@ func TestBackendServer_ParticipantsUpdateTimeout(t *testing.T) {
ctx3, cancel3 := context.WithTimeout(context.Background(), time.Second+100*time.Millisecond)
defer cancel3()
msg2_c, err := client2.RunUntilMessage(ctx3)
if msg2_c != nil {
if msg2_c, _ := client2.RunUntilMessage(ctx3); msg2_c != nil {
if in_call_2, err := checkMessageParticipantsInCall(msg2_c); err != nil {
t.Error(err)
} else if len(in_call_2.Users) != 2 {

5
src/signaling/hub.go
View file

@ -100,7 +100,6 @@ type Hub struct {
upgrader websocket.Upgrader
cookie *securecookie.SecureCookie
info *HelloServerMessageServer
version string
stopped int32
stopChan chan bool
@ -456,13 +455,13 @@ func (h *Hub) GetSessionByPublicId(sessionId string) Session {
}
h.mu.Lock()
session, _ := h.sessions[data.Sid]
session := h.sessions[data.Sid]
h.mu.Unlock()
return session
}
func (h *Hub) checkExpiredSessions(now time.Time) {
for s, _ := range h.expiredSessions {
for s := range h.expiredSessions {
if s.IsExpired(now) {
h.mu.Unlock()
log.Printf("Closing expired session %s (private=%s)", s.PublicId(), s.PrivateId())

10
src/signaling/janus_client.go
View file

@ -430,13 +430,13 @@ func (gateway *JanusGateway) recv() {
decoder := json.NewDecoder(data)
decoder.UseNumber()
if err := decoder.Decode(&base); err != nil {
log.Printf("json.Unmarshal of %s: %s", string(decodeBuffer.Bytes()), err)
log.Printf("json.Unmarshal of %s: %s", decodeBuffer.String(), err)
continue
}
typeFunc, ok := msgtypes[base.Type]
if !ok {
log.Printf("Unknown message type received: %s", string(decodeBuffer.Bytes()))
log.Printf("Unknown message type received: %s", decodeBuffer.String())
continue
}
@ -445,7 +445,7 @@ func (gateway *JanusGateway) recv() {
decoder = json.NewDecoder(data)
decoder.UseNumber()
if err := decoder.Decode(&msg); err != nil {
log.Printf("json.Unmarshal of %s: %s", string(decodeBuffer.Bytes()), err)
log.Printf("json.Unmarshal of %s: %s", decodeBuffer.String(), err)
continue // Decode error
}
@ -461,7 +461,7 @@ func (gateway *JanusGateway) recv() {
session := gateway.Sessions[base.Session]
gateway.Unlock()
if session == nil {
log.Printf("Unable to deliver message %s. Session %d gone?", string(decodeBuffer.Bytes()), base.Session)
log.Printf("Unable to deliver message %s. Session %d gone?", decodeBuffer.String(), base.Session)
continue
}
@ -470,7 +470,7 @@ func (gateway *JanusGateway) recv() {
handle := session.Handles[base.Handle]
session.Unlock()
if handle == nil {
log.Printf("Unable to deliver message %s. Handle %d gone?", string(decodeBuffer.Bytes()), base.Handle)
log.Printf("Unable to deliver message %s. Handle %d gone?", decodeBuffer.String(), base.Handle)
continue
}

2
src/signaling/mcu_janus.go
View file

@ -245,7 +245,7 @@ func (m *mcuJanus) doReconnect() {
m.mu.Unlock()
m.muClients.Lock()
for client, _ := range m.clients {
for client := range m.clients {
go client.NotifyReconnected()
}
m.muClients.Unlock()

15
src/signaling/natsclient_loopback.go
View file

@ -66,14 +66,13 @@ func (s *loopbackNatsSubscription) Unsubscribe() error {
return nil
}
func (s *loopbackNatsSubscription) queue(msg *nats.Msg) error {
func (s *loopbackNatsSubscription) queue(msg *nats.Msg) {
s.cond.L.Lock()
s.incoming = append(s.incoming, msg)
if len(s.incoming) == 1 {
s.cond.Signal()
}
s.cond.L.Unlock()
return nil
}
func (s *loopbackNatsSubscription) run() {
@ -149,13 +148,11 @@ func (c *LoopbackNatsClient) Request(subject string, data []byte, timeout time.D
c.mu.Unlock()
ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel()
select {
case <-ctx.Done():
if ctx.Err() == context.DeadlineExceeded {
err = nats.ErrTimeout
} else {
err = ctx.Err()
}
<-ctx.Done()
if ctx.Err() == context.DeadlineExceeded {
err = nats.ErrTimeout
} else {
err = ctx.Err()
}
c.mu.Lock()
return nil, err

15
src/signaling/natsclient_loopback_test.go
View file

@ -88,7 +88,8 @@ func TestLoopbackNatsClient_Subscribe(t *testing.T) {
if total == max {
err := sub.Unsubscribe()
if err != nil {
t.Fatal("Unsubscribe failed with err:", err)
t.Errorf("Unsubscribe failed with err: %s", err)
return
}
ch <- true
}
@ -135,10 +136,12 @@ func TestLoopbackNatsClient_Request(t *testing.T) {
go func() {
msg := <-dest
if err := client.Publish(msg.Reply, []byte("world")); err != nil {
t.Fatal(err)
t.Error(err)
return
}
if err := sub.Unsubscribe(); err != nil {
t.Fatal("Unsubscribe failed with err:", err)
t.Error("Unsubscribe failed with err:", err)
return
}
}()
reply, err := client.Request("foo", []byte("hello"), 1*time.Second)
@ -182,10 +185,12 @@ func TestLoopbackNatsClient_RequestTimeout(t *testing.T) {
msg := <-dest
time.Sleep(200 * time.Millisecond)
if err := client.Publish(msg.Reply, []byte("world")); err != nil {
t.Fatal(err)
t.Error(err)
return
}
if err := sub.Unsubscribe(); err != nil {
t.Fatal("Unsubscribe failed with err:", err)
t.Error("Unsubscribe failed with err:", err)
return
}
}()
reply, err := client.Request("foo", []byte("hello"), 100*time.Millisecond)

1
src/signaling/room.go
View file

@ -53,7 +53,6 @@ type Room struct {
backend *Backend
properties *json.RawMessage
roomType int
closeChan chan bool
mu *sync.RWMutex

3
src/signaling/testclient_test.go
View file

@ -233,7 +233,8 @@ func NewTestClient(t *testing.T, server *httptest.Server, hub *Hub) *TestClient
readErrorChan <- err
return
} else if messageType != websocket.TextMessage {
t.Fatalf("Expect text message, got %d", messageType)
t.Errorf("Expect text message, got %d", messageType)
return
}
messageChan <- data