summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakob Borg <jakob@kastelo.net>2024-02-27 13:05:19 +0100
committerGitHub <noreply@github.com>2024-02-27 13:05:19 +0100
commit07a9fa2dbd60cdd2ee7f1a74324476547c65f76c (patch)
treeaeb72d3155725f1dc68f7bf86f4fa0aacdca342d
parentaa559bf49615e375b749c735afd97cb6a7fb6698 (diff)
all: Use own automaxprocs package that doesn't log (ref #9436) (#9437)v1.27.4-rc.2v1.27.4
### Purpose 🤫
Diffstat
-rw-r--r--build.go2
-rw-r--r--cmd/stcompdirs/main.go2
-rw-r--r--cmd/stcrashreceiver/main.go2
-rw-r--r--cmd/stdisco/main.go2
-rw-r--r--cmd/stdiscosrv/main.go2
-rw-r--r--cmd/stevents/main.go2
-rw-r--r--cmd/stfileinfo/main.go2
-rw-r--r--cmd/stfinddevice/main.go2
-rw-r--r--cmd/stfindignored/main.go2
-rw-r--r--cmd/stgenfiles/main.go6
-rw-r--r--cmd/strelaypoolsrv/main.go2
-rw-r--r--cmd/strelaysrv/main.go2
-rw-r--r--cmd/strelaysrv/testutil/main.go2
-rw-r--r--cmd/stsigtool/main.go2
-rw-r--r--cmd/stupgrades/main.go2
-rw-r--r--cmd/stvanity/main.go4
-rw-r--r--cmd/stwatchfile/main.go2
-rw-r--r--cmd/syncthing/main.go2
-rw-r--r--cmd/ursrv/main.go2
-rw-r--r--lib/automaxprocs/automaxprocs.go15
20 files changed, 37 insertions, 22 deletions
diff --git a/build.go b/build.go
index 18957bfc7..7595483a2 100644
--- a/build.go
+++ b/build.go
@@ -33,8 +33,8 @@ import (
"text/template"
"time"
+ _ "github.com/syncthing/syncthing/lib/automaxprocs"
buildpkg "github.com/syncthing/syncthing/lib/build"
- _ "go.uber.org/automaxprocs"
)
var (
diff --git a/cmd/stcompdirs/main.go b/cmd/stcompdirs/main.go
index 3a3f0174e..0efff319a 100644
--- a/cmd/stcompdirs/main.go
+++ b/cmd/stcompdirs/main.go
@@ -15,8 +15,8 @@ import (
"os"
"path/filepath"
+ _ "github.com/syncthing/syncthing/lib/automaxprocs"
"github.com/syncthing/syncthing/lib/sha256"
- _ "go.uber.org/automaxprocs"
)
func main() {
diff --git a/cmd/stcrashreceiver/main.go b/cmd/stcrashreceiver/main.go
index 788b14657..657d19e91 100644
--- a/cmd/stcrashreceiver/main.go
+++ b/cmd/stcrashreceiver/main.go
@@ -25,9 +25,9 @@ import (
"github.com/alecthomas/kong"
raven "github.com/getsentry/raven-go"
"github.com/prometheus/client_golang/prometheus/promhttp"
+ _ "github.com/syncthing/syncthing/lib/automaxprocs"
"github.com/syncthing/syncthing/lib/sha256"
"github.com/syncthing/syncthing/lib/ur"
- _ "go.uber.org/automaxprocs"
)
const maxRequestSize = 1 << 20 // 1 MiB
diff --git a/cmd/stdisco/main.go b/cmd/stdisco/main.go
index d0e52d031..8815e1de1 100644
--- a/cmd/stdisco/main.go
+++ b/cmd/stdisco/main.go
@@ -15,10 +15,10 @@ import (
"strings"
"time"
+ _ "github.com/syncthing/syncthing/lib/automaxprocs"
"github.com/syncthing/syncthing/lib/beacon"
"github.com/syncthing/syncthing/lib/discover"
"github.com/syncthing/syncthing/lib/protocol"
- _ "go.uber.org/automaxprocs"
)
var (
diff --git a/cmd/stdiscosrv/main.go b/cmd/stdiscosrv/main.go
index fa1ce3b72..4890f3bda 100644
--- a/cmd/stdiscosrv/main.go
+++ b/cmd/stdiscosrv/main.go
@@ -19,12 +19,12 @@ import (
"time"
"github.com/prometheus/client_golang/prometheus/promhttp"
+ _ "github.com/syncthing/syncthing/lib/automaxprocs"
"github.com/syncthing/syncthing/lib/build"
"github.com/syncthing/syncthing/lib/protocol"
"github.com/syncthing/syncthing/lib/tlsutil"
"github.com/syndtr/goleveldb/leveldb/opt"
"github.com/thejerf/suture/v4"
- _ "go.uber.org/automaxprocs"
)
const (
diff --git a/cmd/stevents/main.go b/cmd/stevents/main.go
index 92224a7d6..4f9a59f37 100644
--- a/cmd/stevents/main.go
+++ b/cmd/stevents/main.go
@@ -15,7 +15,7 @@ import (
"os"
"time"
- _ "go.uber.org/automaxprocs"
+ _ "github.com/syncthing/syncthing/lib/automaxprocs"
)
type event struct {
diff --git a/cmd/stfileinfo/main.go b/cmd/stfileinfo/main.go
index 762e51335..805a1294b 100644
--- a/cmd/stfileinfo/main.go
+++ b/cmd/stfileinfo/main.go
@@ -13,9 +13,9 @@ import (
"os"
"path/filepath"
+ _ "github.com/syncthing/syncthing/lib/automaxprocs"
"github.com/syncthing/syncthing/lib/protocol"
"github.com/syncthing/syncthing/lib/scanner"
- _ "go.uber.org/automaxprocs"
)
func main() {
diff --git a/cmd/stfinddevice/main.go b/cmd/stfinddevice/main.go
index 48f7f862e..8b7364e53 100644
--- a/cmd/stfinddevice/main.go
+++ b/cmd/stfinddevice/main.go
@@ -16,11 +16,11 @@ import (
"os"
"time"
+ _ "github.com/syncthing/syncthing/lib/automaxprocs"
"github.com/syncthing/syncthing/lib/config"
"github.com/syncthing/syncthing/lib/discover"
"github.com/syncthing/syncthing/lib/events"
"github.com/syncthing/syncthing/lib/protocol"
- _ "go.uber.org/automaxprocs"
)
var timeout = 5 * time.Second
diff --git a/cmd/stfindignored/main.go b/cmd/stfindignored/main.go
index cb93e07b1..c400ef2fb 100644
--- a/cmd/stfindignored/main.go
+++ b/cmd/stfindignored/main.go
@@ -12,9 +12,9 @@ import (
"fmt"
"os"
+ _ "github.com/syncthing/syncthing/lib/automaxprocs"
"github.com/syncthing/syncthing/lib/fs"
"github.com/syncthing/syncthing/lib/ignore"
- _ "go.uber.org/automaxprocs"
)
func main() {
diff --git a/cmd/stgenfiles/main.go b/cmd/stgenfiles/main.go
index a03f0ce29..8bd3281a2 100644
--- a/cmd/stgenfiles/main.go
+++ b/cmd/stgenfiles/main.go
@@ -16,7 +16,7 @@ import (
"path/filepath"
"time"
- _ "go.uber.org/automaxprocs"
+ _ "github.com/syncthing/syncthing/lib/automaxprocs"
)
func main() {
@@ -45,7 +45,7 @@ func generateFiles(dir string, files, maxexp int, srcname string) error {
}
p0 := filepath.Join(dir, string(n[0]), n[0:2])
- err = os.MkdirAll(p0, 0755)
+ err = os.MkdirAll(p0, 0o755)
if err != nil {
log.Fatal(err)
}
@@ -84,7 +84,7 @@ func generateOneFile(fd io.ReadSeeker, p1 string, s int64) error {
return err
}
- os.Chmod(p1, os.FileMode(rand.Intn(0777)|0400))
+ os.Chmod(p1, os.FileMode(rand.Intn(0o777)|0o400))
t := time.Now().Add(-time.Duration(rand.Intn(30*86400)) * time.Second)
return os.Chtimes(p1, t, t)
diff --git a/cmd/strelaypoolsrv/main.go b/cmd/strelaypoolsrv/main.go
index c3f8cc89d..6d574e3e8 100644
--- a/cmd/strelaypoolsrv/main.go
+++ b/cmd/strelaypoolsrv/main.go
@@ -26,13 +26,13 @@ import (
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto"
"github.com/syncthing/syncthing/lib/assets"
+ _ "github.com/syncthing/syncthing/lib/automaxprocs"
"github.com/syncthing/syncthing/lib/httpcache"
"github.com/syncthing/syncthing/lib/protocol"
"github.com/syncthing/syncthing/lib/rand"
"github.com/syncthing/syncthing/lib/relay/client"
"github.com/syncthing/syncthing/lib/sync"
"github.com/syncthing/syncthing/lib/tlsutil"
- _ "go.uber.org/automaxprocs"
)
type location struct {
diff --git a/cmd/strelaysrv/main.go b/cmd/strelaysrv/main.go
index 99000624a..2efd61137 100644
--- a/cmd/strelaysrv/main.go
+++ b/cmd/strelaysrv/main.go
@@ -19,6 +19,7 @@ import (
"syscall"
"time"
+ _ "github.com/syncthing/syncthing/lib/automaxprocs"
"github.com/syncthing/syncthing/lib/build"
"github.com/syncthing/syncthing/lib/config"
"github.com/syncthing/syncthing/lib/events"
@@ -29,7 +30,6 @@ import (
"github.com/syncthing/syncthing/lib/relay/protocol"
"github.com/syncthing/syncthing/lib/tlsutil"
_ "github.com/syncthing/syncthing/lib/upnp"
- _ "go.uber.org/automaxprocs"
"golang.org/x/time/rate"
)
diff --git a/cmd/strelaysrv/testutil/main.go b/cmd/strelaysrv/testutil/main.go
index 6138d6bdf..ab35c3ed4 100644
--- a/cmd/strelaysrv/testutil/main.go
+++ b/cmd/strelaysrv/testutil/main.go
@@ -14,10 +14,10 @@ import (
"path/filepath"
"time"
+ _ "github.com/syncthing/syncthing/lib/automaxprocs"
syncthingprotocol "github.com/syncthing/syncthing/lib/protocol"
"github.com/syncthing/syncthing/lib/relay/client"
"github.com/syncthing/syncthing/lib/relay/protocol"
- _ "go.uber.org/automaxprocs"
)
func main() {
diff --git a/cmd/stsigtool/main.go b/cmd/stsigtool/main.go
index 021de6365..b3a497380 100644
--- a/cmd/stsigtool/main.go
+++ b/cmd/stsigtool/main.go
@@ -12,9 +12,9 @@ import (
"log"
"os"
+ _ "github.com/syncthing/syncthing/lib/automaxprocs"
"github.com/syncthing/syncthing/lib/signature"
"github.com/syncthing/syncthing/lib/upgrade"
- _ "go.uber.org/automaxprocs"
)
func main() {
diff --git a/cmd/stupgrades/main.go b/cmd/stupgrades/main.go
index 26c125988..7f0b3beff 100644
--- a/cmd/stupgrades/main.go
+++ b/cmd/stupgrades/main.go
@@ -19,9 +19,9 @@ import (
"time"
"github.com/alecthomas/kong"
+ _ "github.com/syncthing/syncthing/lib/automaxprocs"
"github.com/syncthing/syncthing/lib/httpcache"
"github.com/syncthing/syncthing/lib/upgrade"
- _ "go.uber.org/automaxprocs"
)
type cli struct {
diff --git a/cmd/stvanity/main.go b/cmd/stvanity/main.go
index 5ca9b2624..2bd840a3e 100644
--- a/cmd/stvanity/main.go
+++ b/cmd/stvanity/main.go
@@ -26,8 +26,8 @@ import (
"sync/atomic"
"time"
+ _ "github.com/syncthing/syncthing/lib/automaxprocs"
"github.com/syncthing/syncthing/lib/protocol"
- _ "go.uber.org/automaxprocs"
)
type result struct {
@@ -158,7 +158,7 @@ func saveCert(priv interface{}, derBytes []byte) {
os.Exit(1)
}
- keyOut, err := os.OpenFile("key.pem", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
+ keyOut, err := os.OpenFile("key.pem", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o600)
if err != nil {
fmt.Println(err)
os.Exit(1)
diff --git a/cmd/stwatchfile/main.go b/cmd/stwatchfile/main.go
index 73eebfdf4..8ec0ff95d 100644
--- a/cmd/stwatchfile/main.go
+++ b/cmd/stwatchfile/main.go
@@ -13,8 +13,8 @@ import (
"os"
"time"
+ _ "github.com/syncthing/syncthing/lib/automaxprocs"
"github.com/syncthing/syncthing/lib/sha256"
- _ "go.uber.org/automaxprocs"
)
func main() {
diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go
index fb19f1f28..2c5cc02a2 100644
--- a/cmd/syncthing/main.go
+++ b/cmd/syncthing/main.go
@@ -30,9 +30,9 @@ import (
"time"
"github.com/alecthomas/kong"
+ _ "github.com/syncthing/syncthing/lib/automaxprocs"
"github.com/thejerf/suture/v4"
"github.com/willabides/kongplete"
- _ "go.uber.org/automaxprocs"
"github.com/syncthing/syncthing/cmd/syncthing/cli"
"github.com/syncthing/syncthing/cmd/syncthing/cmdutil"
diff --git a/cmd/ursrv/main.go b/cmd/ursrv/main.go
index 7019dd966..aefe19560 100644
--- a/cmd/ursrv/main.go
+++ b/cmd/ursrv/main.go
@@ -13,7 +13,7 @@ import (
"github.com/alecthomas/kong"
"github.com/syncthing/syncthing/cmd/ursrv/aggregate"
"github.com/syncthing/syncthing/cmd/ursrv/serve"
- _ "go.uber.org/automaxprocs"
+ _ "github.com/syncthing/syncthing/lib/automaxprocs"
)
type CLI struct {
diff --git a/lib/automaxprocs/automaxprocs.go b/lib/automaxprocs/automaxprocs.go
new file mode 100644
index 000000000..f6892fa0a
--- /dev/null
+++ b/lib/automaxprocs/automaxprocs.go
@@ -0,0 +1,15 @@
+// Copyright (C) 2024 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package automaxprocs
+
+import (
+ "go.uber.org/automaxprocs/maxprocs"
+)
+
+func init() {
+ maxprocs.Set()
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 02:44:01 +0000