felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

fix: correct logging of our ID after startup & generate (#10234)

Browse Source 
This is one place we actually want the full string.
This commit is contained in:
Jakob Borg
2025-08-10 06:25:13 +00:00
committed by GitHub
parent adcbd31e62
commit 34f61ce464
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/syncthing/generate/generate.go
+4 -3
View File
@@ -12,6 +12,7 @@ import (
"context" "context"
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"log/slog"
"os" "os"
"github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/config"
@@ -20,7 +21,6 @@ import (
"github.com/syncthing/syncthing/lib/locations" "github.com/syncthing/syncthing/lib/locations"
"github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/protocol"
"github.com/syncthing/syncthing/lib/syncthing" "github.com/syncthing/syncthing/lib/syncthing"
"golang.org/x/exp/slog"
) )
type CLI struct { type CLI struct {
@@ -61,15 +61,16 @@ func Generate(confDir, guiUser, guiPassword string, skipPortProbing bool) error
certFile, keyFile := locations.Get(locations.CertFile), locations.Get(locations.KeyFile) certFile, keyFile := locations.Get(locations.CertFile), locations.Get(locations.KeyFile)
cert, err := tls.LoadX509KeyPair(certFile, keyFile) cert, err := tls.LoadX509KeyPair(certFile, keyFile)
if err == nil { if err == nil {
slog.Warn("Key exists; will not overwrite.") slog.Warn("Key exists; will not overwrite")
} else { } else {
cert, err = syncthing.GenerateCertificate(certFile, keyFile) cert, err = syncthing.GenerateCertificate(certFile, keyFile)
if err != nil { if err != nil {
return fmt.Errorf("create certificate: %w", err) return fmt.Errorf("create certificate: %w", err)
} }
} }
myID = protocol.NewDeviceID(cert.Certificate[0]) myID = protocol.NewDeviceID(cert.Certificate[0])
slog.Info("Genereated new keypair", myID.LogAttr()) slog.Info("Calculated device ID", slog.String("device", myID.String()))
cfgFile := locations.Get(locations.ConfigFile) cfgFile := locations.Get(locations.ConfigFile)
cfg, _, err := config.Load(cfgFile, myID, events.NoopLogger) cfg, _, err := config.Load(cfgFile, myID, events.NoopLogger)
lib/syncthing/syncthing.go
+1 -1
View File
@@ -136,7 +136,7 @@ func (a *App) startup() error {
// Figure out our device ID and log it. // Figure out our device ID and log it.
a.myID = protocol.NewDeviceID(a.cert.Certificate[0]) a.myID = protocol.NewDeviceID(a.cert.Certificate[0])
slog.Info("Calculated our device ID", a.myID.LogAttr()) slog.Info("Calculated our device ID", slog.String("device", a.myID.String()))
// Emit the Starting event, now that we know who we are. // Emit the Starting event, now that we know who we are.