git/work
1
0
Fork 0
Code Issues Pull requests 2 Projects Releases 5 Packages Wiki Activity Actions

refactor: use slog instead of log
Some checks are pending
Go CI Pipeline / ci (push) Waiting to run
Details
Release Builds / GoReleaser build (push) Successful in 1m4s
Details

Browse source
This commit is contained in:
Patryk Hegenberg 2025-06-11 22:41:48 +02:00
parent fcffccc145
commit d8743e54c1
8 changed files with 180 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

37
forwarder.go
View file

@ -3,7 +3,7 @@ package main
import (
"fmt"
"io"
"log"
"log/slog"
"net"
"sync"
@ -31,28 +31,28 @@ func (pf *PortForwarder) forward() error {
localAddr := "127.0.0.1:" + pf.localPort
remoteAddr := net.JoinHostPort(pf.remoteHost, pf.remotePort)
pf.logf("INFO: Starting port forwarder: local %s -> remote %s (via SSH)", localAddr, remoteAddr)
pf.logf("INFO", "Starting port forwarder: local %s -> remote %s (via SSH)", localAddr, remoteAddr)
listener, err := net.Listen("tcp", localAddr)
if err != nil {
pf.logf("ERROR: Failed to open local listener on %s: %v", localAddr, err)
pf.logf("ERROR", "Failed to open local listener on %s: %v", localAddr, err)
return fmt.Errorf("failed to listen on %s: %w", localAddr, err)
}
defer listener.Close()
pf.logf("INFO: Listener active on %s", localAddr)
pf.logf("INFO", "Listener active on %s", localAddr)
for {
localConn, err := listener.Accept()
if err != nil {
if opErr, ok := err.(*net.OpError); ok && opErr.Err.Error() == "use of closed network connection" {
pf.logf("INFO: Listener on %s closed, stopping forwarder.", localAddr)
pf.logf("INFO", "Listener on %s closed, stopping forwarder.", localAddr)
return nil
}
pf.logf("ERROR: Failed to accept incoming connection on %s: %v", localAddr, err)
pf.logf("ERROR", "Failed to accept incoming connection on %s: %v", localAddr, err)
continue
}
pf.logf("INFO: Accepted connection from %s on %s", localConn.RemoteAddr(), localAddr)
pf.logf("INFO", "Accepted connection from %s on %s", localConn.RemoteAddr(), localAddr)
go pf.handleConnection(localConn, remoteAddr)
}
}
@ -60,14 +60,14 @@ func (pf *PortForwarder) forward() error {
func (pf *PortForwarder) handleConnection(localConn net.Conn, remoteAddr string) {
defer localConn.Close()
pf.logf("INFO: Dialing remote host %s via SSH tunnel for %s", remoteAddr, localConn.RemoteAddr())
pf.logf("INFO", "Dialing remote host %s via SSH tunnel for %s", remoteAddr, localConn.RemoteAddr())
remoteConn, err := pf.sshCon.Dial("tcp", remoteAddr)
if err != nil {
pf.logf("ERROR: Failed to dial remote host %s via SSH: %v", remoteAddr, err)
pf.logf("ERROR", "Failed to dial remote host %s via SSH: %v", remoteAddr, err)
return
}
defer remoteConn.Close()
pf.logf("INFO: Connection to %s established. Starting data copy.", remoteAddr)
pf.logf("INFO", "Connection to %s established. Starting data copy.", remoteAddr)
var wg sync.WaitGroup
wg.Add(2)
@ -78,7 +78,7 @@ func (pf *PortForwarder) handleConnection(localConn net.Conn, remoteAddr string)
bytesCopied, err := io.Copy(localConn, remoteConn)
if err != nil {
}
pf.logf("INFO: Finished copying remote->local (%d bytes) for %s", bytesCopied, localConn.RemoteAddr())
pf.logf("INFO", "Finished copying remote->local (%d bytes) for %s", bytesCopied, localConn.RemoteAddr())
}()
go func() {
@ -87,15 +87,22 @@ func (pf *PortForwarder) handleConnection(localConn net.Conn, remoteAddr string)
bytesCopied, err := io.Copy(remoteConn, localConn)
if err != nil {
}
pf.logf("INFO: Finished copying local->remote (%d bytes) for %s", bytesCopied, localConn.RemoteAddr())
pf.logf("INFO", "Finished copying local->remote (%d bytes) for %s", bytesCopied, localConn.RemoteAddr())
}()
wg.Wait()
pf.logf("INFO: Closing forwarded connection for %s", localConn.RemoteAddr())
pf.logf("INFO", "Closing forwarded connection for %s", localConn.RemoteAddr())
}
func (pf *PortForwarder) logf(format string, v ...any) {
func (pf *PortForwarder) logf(level, format string, v ...any) {
pf.logMutex.Lock()
defer pf.logMutex.Unlock()
log.Printf(format, v...)
switch level {
case "INFO":
slog.Info(format, v...)
case "WARN":
slog.Warn(format, v...)
case "ERROR":
slog.Error(format, v...)
}
}