[PR #3352] [MERGED] trace log adds join errors #4732

New issue

Closed

opened 2026-05-05 14:47:39 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 14:47:39 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/fatedier/frp/pull/3352
Author: @fatedier
Created: 3/11/2023
Status: ✅ Merged
Merged: 3/11/2023
Merged by: @fatedier

Base: dev ← Head: nathole

📝 Commits (1)

110273e trace log adds join errors

📊 Changes

5 files changed (+12 additions, -6 deletions)

View changed files

📝 client/proxy/proxy.go (+4 -1)
📝 client/visitor.go (+4 -1)
📝 go.mod (+1 -1)
📝 go.sum (+2 -2)
📝 server/proxy/proxy.go (+1 -1)

📄 Description

`🤖 Generated by Copilot at 110273e`

Summary

🐛🐛🆙

This pull request improves the error handling and logging of the frpIo.Join function, which joins connections and copies data between them. It updates the github.com/fatedier/golib dependency and adds error logging to the client/proxy/proxy.go and client/visitor.go files. It also adapts the server/proxy/proxy.go file to the new frpIo.Join function signature.

frpIo.Join errors
Logged with xl.Trace now
Winter of debugging

Walkthrough

Add error handling and logging to frpIo.Join function calls in client/proxy/proxy.go and client/visitor.go (link, link)
Update github.com/fatedier/golib dependency in go.mod to the latest commit (link)
Ignore the slice of errors returned by frpIo.Join in server/proxy/proxy.go (link)

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/fatedier/frp/pull/3352 **Author:** [@fatedier](https://github.com/fatedier) **Created:** 3/11/2023 **Status:** ✅ Merged **Merged:** 3/11/2023 **Merged by:** [@fatedier](https://github.com/fatedier) **Base:** `dev` ← **Head:** `nathole` --- ### 📝 Commits (1) - [`110273e`](https://github.com/fatedier/frp/commit/110273e1e382fb190ac4bf1a3a0faa515e3ac4eb) trace log adds join errors ### 📊 Changes **5 files changed** (+12 additions, -6 deletions) <details> <summary>View changed files</summary> 📝 `client/proxy/proxy.go` (+4 -1) 📝 `client/visitor.go` (+4 -1) 📝 `go.mod` (+1 -1) 📝 `go.sum` (+2 -2) 📝 `server/proxy/proxy.go` (+1 -1) </details> ### 📄 Description  ### <samp>🤖 Generated by Copilot at 110273e</samp> ### Summary 🐛🐛🆙  This pull request improves the error handling and logging of the `frpIo.Join` function, which joins connections and copies data between them. It updates the `github.com/fatedier/golib` dependency and adds error logging to the `client/proxy/proxy.go` and `client/visitor.go` files. It also adapts the `server/proxy/proxy.go` file to the new `frpIo.Join` function signature. > _`frpIo.Join` errors_ > _Logged with `xl.Trace` now_ > _Winter of debugging_ ### Walkthrough * Add error handling and logging to `frpIo.Join` function calls in `client/proxy/proxy.go` and `client/visitor.go` ([link](https://github.com/fatedier/frp/pull/3352/files?diff=unified&w=0#diff-e7005325b1c025aff14dc50c8eb543e39d5ddcd6628e973ea6b5b12fa146a18aL822-R826), [link](https://github.com/fatedier/frp/pull/3352/files?diff=unified&w=0#diff-19a706a22d1a3b072f4396701827971d500fc88483c3e3f3f3b7ce19e16e0d2aL342-R346)) * Update `github.com/fatedier/golib` dependency in `go.mod` to the latest commit ([link](https://github.com/fatedier/frp/pull/3352/files?diff=unified&w=0#diff-33ef32bf6c23acb95f5902d7097b7a1d5128ca061167ec0716715b0b9eeaa5f6L9-R9)) * Ignore the slice of errors returned by `frpIo.Join` in `server/proxy/proxy.go` ([link](https://github.com/fatedier/frp/pull/3352/files?diff=unified&w=0#diff-1934fd5992845347455fe5e26d6ed40e53ba26f246a0fc9c3d4a70efdbbad6e6L322-R322)) --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>