mirror of
https://github.com/yusing/godoxy.git
synced 2026-03-11 21:05:23 +01:00
6da7227f9b
This is a large-scale refactoring across the codebase that replaces the custom `gperr.Error` type with Go's standard `error` interface. The changes include: - Replacing `gperr.Error` return types with `error` in function signatures - Using `errors.New()` and `fmt.Errorf()` instead of `gperr.New()` and `gperr.Errorf()` - Using `%w` format verb for error wrapping instead of `.With()` method - Replacing `gperr.Subject()` calls with `gperr.PrependSubject()` - Converting error logging from `gperr.Log*()` functions to zerolog's `.Err().Msg()` pattern - Update NewLogger to handle multiline error message - Updating `goutils` submodule to latest commit This refactoring aligns with Go idioms and removes the dependency on custom error handling abstractions in favor of standard library patterns.
73 lines
1.2 KiB
Go
73 lines
1.2 KiB
Go
package rules
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"io"
|
|
"math/rand"
|
|
"os"
|
|
"sync"
|
|
|
|
"github.com/yusing/godoxy/internal/common"
|
|
"github.com/yusing/godoxy/internal/logging/accesslog"
|
|
)
|
|
|
|
type noopWriteCloser struct {
|
|
io.Writer
|
|
}
|
|
|
|
func (n noopWriteCloser) Close() error {
|
|
return nil
|
|
}
|
|
|
|
var (
|
|
stdout io.WriteCloser = noopWriteCloser{os.Stdout}
|
|
stderr io.WriteCloser = noopWriteCloser{os.Stderr}
|
|
)
|
|
|
|
var (
|
|
testFiles = make(map[string]*bytes.Buffer)
|
|
testFilesLock sync.Mutex
|
|
)
|
|
|
|
func openFile(path string) (io.WriteCloser, error) {
|
|
switch path {
|
|
case "/dev/stdout":
|
|
return stdout, nil
|
|
case "/dev/stderr":
|
|
return stderr, nil
|
|
}
|
|
|
|
if common.IsTest {
|
|
testFilesLock.Lock()
|
|
defer testFilesLock.Unlock()
|
|
if buf, ok := testFiles[path]; ok {
|
|
return noopWriteCloser{buf}, nil
|
|
}
|
|
buf := bytes.NewBuffer(nil)
|
|
testFiles[path] = buf
|
|
return noopWriteCloser{buf}, nil
|
|
}
|
|
|
|
f, err := accesslog.OpenFile(path)
|
|
if err != nil {
|
|
return nil, ErrInvalidArguments.With(err)
|
|
}
|
|
return f, nil
|
|
}
|
|
|
|
func TestRandomFileName() string {
|
|
return fmt.Sprintf("test-file-%d.txt", rand.Intn(1000000))
|
|
}
|
|
|
|
func TestFileContent(path string) []byte {
|
|
testFilesLock.Lock()
|
|
defer testFilesLock.Unlock()
|
|
|
|
buf, ok := testFiles[path]
|
|
if !ok {
|
|
return nil
|
|
}
|
|
return buf.Bytes()
|
|
}
|