Merge branch 'main' into update-core-actions

netbirdio · Sep 11, 2024 · cf7b898 · cf7b898
2 parents 43b36a4 + 47adb97
commit cf7b898
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/.github/workflows/test-infrastructure-files.yml b/.github/workflows/test-infrastructure-files.yml
@@ -221,9 +221,6 @@ jobs:
  - name: Checkout code
  uses: actions/checkout@v4
 
- - name: handle insisting image # remove after release
- run: docker pull netbirdio/relay:latest || docker pull netbirdio/signal:latest && docker tag netbirdio/signal:latest netbirdio/relay:latest
-
  - name: run script with Zitadel PostgreSQL
  run: NETBIRD_DOMAIN=use-ip bash -x infrastructure_files/getting-started-with-zitadel.sh
 
@@ -259,9 +256,6 @@ jobs:
  docker compose down --volumes --rmi all
  rm -rf docker-compose.yml Caddyfile zitadel.env dashboard.env machinekey/zitadel-admin-sa.token turnserver.conf management.json zdb.env
 
- - name: handle insisting image gen CockroachDB # remove after release
- run: docker pull netbirdio/relay:latest || docker pull netbirdio/signal:latest && docker tag netbirdio/signal:latest netbirdio/relay:latest
-
  - name: run script with Zitadel CockroachDB
  run: bash -x infrastructure_files/getting-started-with-zitadel.sh
  env:

diff --git a/relay/metrics/realy.go b/relay/metrics/realy.go
@@ -103,7 +103,7 @@ func (m *Metrics) PeerActivity(peerID string) {
  select {
  case m.peerActivityChan <- peerID:
  default:
- log.Errorf("peer activity channel is full, dropping activity metrics for peer %s", peerID)
+ log.Tracef("peer activity channel is full, dropping activity metrics for peer %s", peerID)
  }
 }
 

diff --git a/relay/server/peer.go b/relay/server/peer.go
@@ -184,7 +184,7 @@ func (p *Peer) handleTransportMsg(msg []byte) {
  stringPeerID := messages.HashIDToString(peerID)
  dp, ok := p.store.Peer(stringPeerID)
  if !ok {
- p.log.Errorf("peer not found: %s", stringPeerID)
+ p.log.Debugf("peer not found: %s", stringPeerID)
  return
  }