chore: disable unused last version parsing

internal/idlewatcher/handle_http.go

@@ -38,6 +38,10 @@ func (w *Watcher) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 		return
 	default:
 		f := &ForceCacheControl{expires: w.expires().Format(http.TimeFormat), ResponseWriter: rw}
+		w, ok := watcherMap[w.Key()] // could've been reloaded
+		if !ok {
+			return
+		}
 		w.rp.ServeHTTP(f, r)
 	}
 }

internal/logging/accesslog/access_logger.go

@@ -43,6 +43,12 @@ type (
 		Name() string // file name or path
 	}
 
+	SupportRotate interface {
+		io.Writer
+		supportRotate
+		Name() string
+	}
+
 	RequestFormatter interface {
 		// AppendRequestLog appends a log line to line with or without a trailing newline
 		AppendRequestLog(line []byte, req *http.Request, res *http.Response) []byte

internal/logging/accesslog/file_logger.go

@@ -2,8 +2,9 @@ package accesslog
 
 import (
 	"fmt"
+	"io"
 	"os"
-	pathPkg "path"
+	"path/filepath"
 	"sync"
 
 	"github.com/yusing/go-proxy/internal/logging"
@@ -11,7 +12,7 @@ import (
 )
 
 type File struct {
-	*os.File
+	f *os.File
 
 	// os.File.Name() may not equal to key of `openedFiles`.
 	// Store it for later delete from `openedFiles`.
@@ -25,21 +26,25 @@ var (
 	openedFilesMu sync.Mutex
 )
 
-func newFileIO(path string) (WriterWithName, error) {
+func newFileIO(path string) (SupportRotate, error) {
 	openedFilesMu.Lock()
 	defer openedFilesMu.Unlock()
 
 	var file *File
-	path = pathPkg.Clean(path)
+	path = filepath.Clean(path)
 	if opened, ok := openedFiles[path]; ok {
 		opened.refCount.Add()
 		return opened, nil
 	} else {
-		f, err := os.OpenFile(path, os.O_APPEND|os.O_CREATE|os.O_RDWR, 0o644)
+		// cannot open as O_APPEND as we need Seek and WriteAt
+		f, err := os.OpenFile(path, os.O_CREATE|os.O_RDWR, 0o644)
 		if err != nil {
 			return nil, fmt.Errorf("access log open error: %w", err)
 		}
-		file = &File{File: f, path: path, refCount: utils.NewRefCounter()}
+		if _, err := f.Seek(0, io.SeekEnd); err != nil {
+			return nil, fmt.Errorf("access log seek error: %w", err)
+		}
+		file = &File{f: f, path: path, refCount: utils.NewRefCounter()}
 		openedFiles[path] = file
 		go file.closeOnZero()
 	}
@@ -47,6 +52,30 @@ func newFileIO(path string) (WriterWithName, error) {
 	return file, nil
 }
 
+func (f *File) Name() string {
+	return f.f.Name()
+}
+
+func (f *File) Write(p []byte) (n int, err error) {
+	return f.f.Write(p)
+}
+
+func (f *File) ReadAt(p []byte, off int64) (n int, err error) {
+	return f.f.ReadAt(p, off)
+}
+
+func (f *File) WriteAt(p []byte, off int64) (n int, err error) {
+	return f.f.WriteAt(p, off)
+}
+
+func (f *File) Seek(offset int64, whence int) (int64, error) {
+	return f.f.Seek(offset, whence)
+}
+
+func (f *File) Truncate(size int64) error {
+	return f.f.Truncate(size)
+}
+
 func (f *File) Close() error {
 	f.refCount.Sub()
 	return nil
@@ -62,5 +91,5 @@ func (f *File) closeOnZero() {
 	openedFilesMu.Lock()
 	delete(openedFiles, f.path)
 	openedFilesMu.Unlock()
-	f.File.Close()
+	f.f.Close()
 }

internal/logging/accesslog/rotate.go

@@ -12,7 +12,7 @@ import (
 )
 
 type supportRotate interface {
-	io.ReadSeeker
+	io.Seeker
 	io.ReaderAt
 	io.WriterAt
 	Truncate(size int64) error
@@ -66,9 +66,23 @@ var rotateBytePool = synk.NewBytesPool(0, 16*1024*1024)
 // If the file does not need to be rotated, it returns nil, nil.
 func rotateLogFile(file supportRotate, config *Retention) (result *RotateResult, err error) {
 	if config.KeepSize > 0 {
-		return rotateLogFileBySize(file, config)
+		result, err = rotateLogFileBySize(file, config)
+	} else {
+		result, err = rotateLogFileByPolicy(file, config)
 	}
 
+	if err != nil {
+		return nil, err
+	}
+
+	if _, err := file.Seek(0, io.SeekEnd); err != nil {
+		return nil, err
+	}
+
+	return result, nil
+}
+
+func rotateLogFileByPolicy(file supportRotate, config *Retention) (result *RotateResult, err error) {
 	var shouldStop func() bool
 	t := utils.TimeNow()
 
@@ -234,7 +248,6 @@ var timeJSON = []byte(`"time":"`)
 //
 // The returned time is not validated.
 func ExtractTime(line []byte) []byte {
-	//TODO: optimize this
 	switch line[0] {
 	case '{': // JSON format
 		if i := bytes.Index(line, timeJSON); i != -1 {

internal/route/route.go

@@ -151,6 +151,10 @@ func (r *Route) Validate() gperr.Error {
 		}
 	}
 
+	if r.Container != nil && r.Container.IdlewatcherConfig != nil {
+		r.Idlewatcher = r.Container.IdlewatcherConfig
+	}
+
 	// return error if route is localhost:<godoxy_port>
 	switch r.Host {
 	case "localhost", "127.0.0.1":

pkg/version.go

@@ -3,14 +3,9 @@ package pkg
 import (
 	"fmt"
 	"net/http"
-	"os"
-	"path/filepath"
 	"regexp"
 	"strconv"
 	"strings"
-
-	"github.com/yusing/go-proxy/internal/common"
-	"github.com/yusing/go-proxy/internal/logging"
 )
 
 func GetVersion() Version {
@@ -31,26 +26,26 @@ func init() {
 	currentVersion = ParseVersion(version)
 
 	// ignore errors
-	versionFile := filepath.Join(common.DataDir, "version")
-	var lastVersionStr string
-	f, err := os.OpenFile(versionFile, os.O_RDWR|os.O_CREATE, 0o644)
-	if err == nil {
-		_, err = fmt.Fscanf(f, "%s", &lastVersionStr)
-		lastVersion = ParseVersion(lastVersionStr)
-	}
-	if err != nil && !os.IsNotExist(err) {
-		logging.Warn().Err(err).Msg("failed to read version file")
-		return
-	}
-	if err := f.Truncate(0); err != nil {
-		logging.Warn().Err(err).Msg("failed to truncate version file")
-		return
-	}
-	_, err = f.WriteString(version)
-	if err != nil {
-		logging.Warn().Err(err).Msg("failed to save version file")
-		return
-	}
+	// versionFile := filepath.Join(common.DataDir, "version")
+	// var lastVersionStr string
+	// f, err := os.OpenFile(versionFile, os.O_RDWR|os.O_CREATE, 0o644)
+	// if err == nil {
+	// 	_, err = fmt.Fscanf(f, "%s", &lastVersionStr)
+	// 	lastVersion = ParseVersion(lastVersionStr)
+	// }
+	// if err != nil && !os.IsNotExist(err) {
+	// 	logging.Warn().Err(err).Msg("failed to read version file")
+	// 	return
+	// }
+	// if err := f.Truncate(0); err != nil {
+	// 	logging.Warn().Err(err).Msg("failed to truncate version file")
+	// 	return
+	// }
+	// _, err = f.WriteString(version)
+	// if err != nil {
+	// 	logging.Warn().Err(err).Msg("failed to save version file")
+	// 	return
+	// }
 }
 
 type Version struct{ Generation, Major, Minor int }