benjamyn/any-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #24 from anyproto/fix-metrics

Browse Source 
Peer addr in ctx + fix any-sync version
This commit is contained in:
Sergey Cherepanov 2023-06-13 19:09:58 +02:00 committed by GitHub
commit ff3fc68451
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/app.go
View File

@ -89,7 +89,7 @@ func (app *App) VersionName() string {
if app.versionName != "" { if app.versionName != "" {
return app.versionName return app.versionName
} }
return AppName + ":" + GitSummary + "/any-sync:" + app.anySyncVersion return AppName + ":" + GitSummary + "/any-sync:" + app.AnySyncVersion()
} }
type Stat struct { type Stat struct {

2
net/transport/yamux/conn.go
View File

@ -3,6 +3,7 @@ package yamux
import ( import (
"context" "context"
"github.com/anyproto/any-sync/net/connutil" "github.com/anyproto/any-sync/net/connutil"
"github.com/anyproto/any-sync/net/peer"
"github.com/anyproto/any-sync/net/transport" "github.com/anyproto/any-sync/net/transport"
"github.com/hashicorp/yamux" "github.com/hashicorp/yamux"
"net" "net"
@ -10,6 +11,7 @@ import (
) )
func NewMultiConn(cctx context.Context, luConn *connutil.LastUsageConn, addr string, sess *yamux.Session) transport.MultiConn { func NewMultiConn(cctx context.Context, luConn *connutil.LastUsageConn, addr string, sess *yamux.Session) transport.MultiConn {
cctx = peer.CtxWithPeerAddr(cctx, sess.RemoteAddr().String())
return &yamuxConn{ return &yamuxConn{
ctx: cctx, ctx: cctx,
luConn: luConn, luConn: luConn,