build: update logging statements to make json log work - fixes #6038

This changes log statements from log to fs package, which is required for --use-json-log
to properly make log output in JSON format. The recently added custom linting rule,
handled by ruleguard via gocritic via golangci-lint, warns about these and suggests
the alternative. Fixing was therefore basically running "golangci-lint run --fix",
although some manual fixup of mainly imports are necessary following that.
This commit is contained in:
albertony
2024-09-06 17:04:18 +01:00
committed by Nick Craig-Wood
parent 88b0757288
commit bcdfad3c83
64 changed files with 333 additions and 357 deletions
+3 -3
View File
@@ -4,12 +4,12 @@ package main
import (
"flag"
"fmt"
"log"
"math/rand"
"os"
"strconv"
"strings"
"github.com/rclone/rclone/fs"
"github.com/rclone/rclone/lib/encoder"
)
@@ -434,13 +434,13 @@ var testCasesDoubleEdge = []testCase{
func fatal(err error, s ...interface{}) {
if err != nil {
log.Fatalln(append(s, err))
fs.Fatal(nil, fmt.Sprint(append(s, err)))
}
}
func fatalW(_ int, err error) func(...interface{}) {
if err != nil {
return func(s ...interface{}) {
log.Fatalln(append(s, err))
fs.Fatal(nil, fmt.Sprint(append(s, err)))
}
}
return func(s ...interface{}) {}
+3 -3
View File
@@ -2,8 +2,8 @@ package http
import (
"bytes"
"fmt"
"html/template"
"log"
"github.com/rclone/rclone/fs"
"github.com/rclone/rclone/fs/config/flags"
@@ -42,7 +42,7 @@ Use ` + "`--{{ .Prefix }}salt`" + ` to change the password hashing salt from the
`
tmpl, err := template.New("auth help").Parse(help)
if err != nil {
log.Fatal("Fatal error parsing template", err)
fs.Fatal(nil, fmt.Sprint("Fatal error parsing template", err))
}
data := struct {
@@ -53,7 +53,7 @@ Use ` + "`--{{ .Prefix }}salt`" + ` to change the password hashing salt from the
buf := &bytes.Buffer{}
err = tmpl.Execute(buf, data)
if err != nil {
log.Fatal("Fatal error executing template", err)
fs.Fatal(nil, fmt.Sprint("Fatal error executing template", err))
}
return buf.String()
}
+4 -5
View File
@@ -9,7 +9,6 @@ import (
"errors"
"fmt"
"html/template"
"log"
"net"
"net/http"
"os"
@@ -78,7 +77,7 @@ certificate authority certificate.
`
tmpl, err := template.New("server help").Parse(help)
if err != nil {
log.Fatal("Fatal error parsing template", err)
fs.Fatal(nil, fmt.Sprint("Fatal error parsing template", err))
}
data := struct {
@@ -89,7 +88,7 @@ certificate authority certificate.
buf := &bytes.Buffer{}
err = tmpl.Execute(buf, data)
if err != nil {
log.Fatal("Fatal error executing template", err)
fs.Fatal(nil, fmt.Sprint("Fatal error executing template", err))
}
return buf.String()
}
@@ -199,7 +198,7 @@ func (s instance) serve(wg *sync.WaitGroup) {
defer wg.Done()
err := s.httpServer.Serve(s.listener)
if err != http.ErrServerClosed && err != nil {
log.Printf("%s: unexpected error: %s", s.listener.Addr(), err.Error())
fs.Logf(nil, "%s: unexpected error: %s", s.listener.Addr(), err.Error())
}
}
@@ -497,7 +496,7 @@ func (s *Server) Shutdown() error {
expiry := time.Now().Add(gracefulShutdownTime)
ctx, cancel := context.WithDeadline(context.Background(), expiry)
if err := ii.httpServer.Shutdown(ctx); err != nil {
log.Printf("error shutting down server: %s", err)
fs.Logf(nil, "error shutting down server: %s", err)
}
cancel()
}
+3 -3
View File
@@ -3,8 +3,8 @@ package http
import (
"bytes"
"embed"
"fmt"
"html/template"
"log"
"os"
"strings"
"time"
@@ -57,7 +57,7 @@ be used to render HTML based on specific conditions.
tmpl, err := template.New("template help").Parse(help)
if err != nil {
log.Fatal("Fatal error parsing template", err)
fs.Fatal(nil, fmt.Sprint("Fatal error parsing template", err))
}
data := struct {
@@ -68,7 +68,7 @@ be used to render HTML based on specific conditions.
buf := &bytes.Buffer{}
err = tmpl.Execute(buf, data)
if err != nil {
log.Fatal("Fatal error executing template", err)
fs.Fatal(nil, fmt.Sprint("Fatal error executing template", err))
}
return buf.String()
}
+3 -3
View File
@@ -4,10 +4,10 @@ package pool
import (
"fmt"
"log"
"sync"
"time"
"github.com/rclone/rclone/fs"
"github.com/rclone/rclone/lib/mmap"
)
@@ -161,7 +161,7 @@ func (bp *Pool) Get() []byte {
bp.alloced++
break
}
log.Printf("Failed to get memory for buffer, waiting for %v: %v", waitTime, err)
fs.Logf(nil, "Failed to get memory for buffer, waiting for %v: %v", waitTime, err)
bp.mu.Unlock()
time.Sleep(waitTime)
bp.mu.Lock()
@@ -178,7 +178,7 @@ func (bp *Pool) Get() []byte {
func (bp *Pool) freeBuffer(mem []byte) {
err := bp.free(mem)
if err != nil {
log.Printf("Failed to free memory: %v", err)
fs.Logf(nil, "Failed to free memory: %v", err)
}
bp.alloced--
}
+3 -3
View File
@@ -2,10 +2,10 @@ package systemd
import (
"fmt"
"log"
"sync"
"github.com/coreos/go-systemd/v22/daemon"
"github.com/rclone/rclone/fs"
"github.com/rclone/rclone/lib/atexit"
)
@@ -18,13 +18,13 @@ import (
// It should not be called as a result of rc commands. See #7540.
func Notify() func() {
if _, err := daemon.SdNotify(false, daemon.SdNotifyReady); err != nil {
log.Printf("failed to notify ready to systemd: %v", err)
fs.Logf(nil, "failed to notify ready to systemd: %v", err)
}
var finaliseOnce sync.Once
finalise := func() {
finaliseOnce.Do(func() {
if _, err := daemon.SdNotify(false, daemon.SdNotifyStopping); err != nil {
log.Printf("failed to notify stopping to systemd: %v", err)
fs.Logf(nil, "failed to notify stopping to systemd: %v", err)
}
})
}