优化性能,适配 logrotate

This commit is contained in:
2025-06-24 11:13:21 +08:00
parent 9bc1be1020
commit c6050d6824
3 changed files with 92 additions and 38 deletions

View File

@@ -6,9 +6,11 @@ import (
"io"
"net"
"os"
"os/signal"
"path/filepath"
"strings"
"sync"
"syscall"
"time"
"github.com/fsnotify/fsnotify"
@@ -129,6 +131,11 @@ func watchConfig() *fsnotify.Watcher {
}
func main() {
if err := writePIDFile(); err != nil {
panic(fmt.Sprintf("Failed to write PID file: %v", err))
}
defer removePIDFile()
if err := loadConfig(); err != nil {
panic(err)
}
@@ -136,6 +143,8 @@ func main() {
watcher := watchConfig()
defer watcher.Close()
go handleLogRotate()
// 监听TCP端口
listener, err := net.Listen("tcp", fmt.Sprintf(":%d", config.Port))
if err != nil {
@@ -179,6 +188,8 @@ func handleRequest(conn net.Conn) {
// 确保连接关闭
defer conn.Close()
setSocketOptions(conn)
buf := make([]byte, 1024)
n, err := conn.Read(buf)
if err != nil {
@@ -212,59 +223,39 @@ func handleRequest(conn net.Conn) {
defer client.Close()
client.Write(buf[:n])
// 不需要 buf 了,释放掉
buf = nil
var wg sync.WaitGroup
wg.Add(2)
wg.Add(1)
go handleRead(client, conn, &wg)
go handleWrite(client, conn, &wg)
handleWrite(client, conn, nil)
// 等待所有读写操作完成
// 不放在 defer 中,以防报错时无法关闭连接
wg.Wait()
}
func handleRead(srv, cli net.Conn, wg *sync.WaitGroup) {
defer func() {
wg.Done()
srv.Close()
cli.Close()
}()
if wg != nil {
defer wg.Done()
}
buf := make([]byte, 1024)
for {
n, err := srv.Read(buf)
if err != nil {
log.Err(err).Msg("Error reading from server")
return
}
if _, err := cli.Write(buf[:n]); err != nil {
log.Err(err).Msg("Error writing to client")
return
}
_, err := io.Copy(srv, cli)
if err != nil && err != io.EOF {
log.Err(err).Msg("Error copying data")
}
}
func handleWrite(srv, cli net.Conn, wg *sync.WaitGroup) {
defer func() {
wg.Done()
srv.Close()
cli.Close()
}()
if wg != nil {
defer wg.Done()
}
buf := make([]byte, 1024)
for {
n, err := cli.Read(buf)
if err != nil {
log.Err(err).Msg("Error reading from client")
return
}
if _, err := srv.Write(buf[:n]); err != nil {
log.Err(err).Msg("Error writing to server")
return
}
_, err := io.Copy(cli, srv)
if err != nil && err != io.EOF {
log.Err(err).Msg("Error copying data")
}
}
@@ -287,3 +278,43 @@ func getMcHost(buf []byte) string {
return host
}
}
func setSocketOptions(conn net.Conn) {
if tcpConn, ok := conn.(*net.TCPConn); ok {
tcpConn.SetNoDelay(true) // 禁用 Nagle 算法
tcpConn.SetKeepAlive(true)
tcpConn.SetKeepAlivePeriod(30 * time.Second)
}
}
func handleLogRotate() {
signalChan := make(chan os.Signal, 1)
signal.Notify(signalChan, syscall.SIGHUP)
for range signalChan {
log.Info().Msg("Received SIGHUP, reopening log file")
if err := reopenLogFile(); err != nil {
log.Error().Err(err).Msg("Failed to reopen log file")
}
}
}
func reopenLogFile() error {
configLoadLock.Lock()
defer configLoadLock.Unlock()
if config.Log.File == "" {
return nil
}
// 重新打开日志文件
logFile, err := os.OpenFile(config.Log.File, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
if err != nil {
return err
}
log.Logger = log.Logger.Output(io.MultiWriter(os.Stdout, logFile))
currentLogFile = config.Log.File
return nil
}

15
cmd/gateway/pid_linux.go Normal file
View File

@@ -0,0 +1,15 @@
package main
import (
"fmt"
"os"
)
func writePIDFile() error {
pid := os.Getpid()
return os.WriteFile("/var/run/mc-gateway.pid", []byte(fmt.Sprintf("%d\n", pid)), 0644)
}
func removePIDFile() {
os.Remove("/var/run/mc-gateway.pid")
}

View File

@@ -0,0 +1,8 @@
package main
func writePIDFile() error {
return nil
}
func removePIDFile() {
}