mirror of
https://github.com/syncthing/syncthing.git
synced 2026-05-11 08:33:04 -04:00
This updates our logging framework from legacy freetext strings using the `log` package to structured log entries using `log/slog`. I have updated all INFO or higher level entries, but not yet DEBUG (😓)... So, at a high level: There is a slight change in log levels, effectively adding a new warning level: - DEBUG is still debug (ideally not for users but developers, though this is something we need to work on) - INFO is still info, though I've added more data here, effectively making Syncthing more verbose by default (more on this below) - WARNING is a new log level that is different from the _old_ WARNING (more below) - ERROR is what was WARNING before -- problems that must be dealt with, and also bubbled as a popup in the GUI. A new feature is that the logging level can be set per package to something other than just debug or info, and hence I feel that we can add a bit more things into INFO while moving some (in fact, most) current INFO level warnings into WARNING. For example, I think it's justified to get a log of synced files in INFO and sync failures in WARNING. These are things that have historically been tricky to debug properly, and having more information by default will be useful to many, while still making it possible get close to told level of inscrutability by setting the log level to WARNING. I'd like to get to a stage where DEBUG is never necessary to just figure out what's going on, as opposed to trying to narrow down a likely bug. Code wise: - Our logging object, generally known as `l` in each package, is now a new adapter object that provides the old API on top of the newer one. (This should go away once all old log entries are migrated.) This is only for `l.Debugln` and `l.Debugf`. - There is a new level tracker that keeps the log level for each package. - There is a nested setup of handlers, since the structure mandated by `log/slog` is slightly convoluted (imho). We do this because we need to do formatting at a "medium" level internally so we can buffer log lines in text format but with separate timestamp and log level for the API/GUI to consume. - The `debug` API call becomes a `loglevels` API call, which can set the log level to `DEBUG`, `INFO`, `WARNING` or `ERROR` per package. The GUI is updated to handle this. - Our custom `sync` package provided some debugging of mutexes quite strongly integrated into the old logging framework, only turned on when `STTRACE` was set to certain values at startup, etc. It's been a long time since this has been useful; I removed it. - The `STTRACE` env var remains and can be used the same way as before, while additionally permitting specific log levels to be specified, `STTRACE=model:WARN,scanner:DEBUG`. - There is a new command line option `--log-level=INFO` to set the default log level. - The command line options `--log-flags` and `--verbose` go away, but are currently retained as hidden & ignored options since we set them by default in some of our startup examples and Syncthing would otherwise fail to start. Sample format messages: ``` 2009-02-13 23:31:30 INF A basic info line (attr1="val with spaces" attr2=2 attr3="val\"quote" a=a log.pkg=slogutil) 2009-02-13 23:31:30 INF An info line with grouped values (attr1=val1 foo.attr2=2 foo.bar.attr3=3 a=a log.pkg=slogutil) 2009-02-13 23:31:30 INF An info line with grouped values via logger (foo.attr1=val1 foo.attr2=2 a=a log.pkg=slogutil) 2009-02-13 23:31:30 INF An info line with nested grouped values via logger (bar.foo.attr1=val1 bar.foo.attr2=2 a=a log.pkg=slogutil) 2009-02-13 23:31:30 WRN A warning entry (a=a log.pkg=slogutil) 2009-02-13 23:31:30 ERR An error (a=a log.pkg=slogutil) ``` --------- Co-authored-by: Ross Smith II <ross@smithii.com>
118 lines
3.2 KiB
Go
118 lines
3.2 KiB
Go
// Copyright (C) 2018 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 model
|
|
|
|
import (
|
|
"fmt"
|
|
"slices"
|
|
"strings"
|
|
|
|
"github.com/syncthing/syncthing/internal/itererr"
|
|
"github.com/syncthing/syncthing/lib/config"
|
|
"github.com/syncthing/syncthing/lib/events"
|
|
"github.com/syncthing/syncthing/lib/fs"
|
|
"github.com/syncthing/syncthing/lib/ignore"
|
|
"github.com/syncthing/syncthing/lib/protocol"
|
|
"github.com/syncthing/syncthing/lib/semaphore"
|
|
"github.com/syncthing/syncthing/lib/versioner"
|
|
)
|
|
|
|
func init() {
|
|
folderFactories[config.FolderTypeReceiveEncrypted] = newReceiveEncryptedFolder
|
|
}
|
|
|
|
type receiveEncryptedFolder struct {
|
|
*sendReceiveFolder
|
|
}
|
|
|
|
func newReceiveEncryptedFolder(model *model, ignores *ignore.Matcher, cfg config.FolderConfiguration, ver versioner.Versioner, evLogger events.Logger, ioLimiter *semaphore.Semaphore) service {
|
|
f := &receiveEncryptedFolder{newSendReceiveFolder(model, ignores, cfg, ver, evLogger, ioLimiter).(*sendReceiveFolder)}
|
|
f.localFlags = protocol.FlagLocalReceiveOnly // gets propagated to the scanner, and set on locally changed files
|
|
return f
|
|
}
|
|
|
|
func (f *receiveEncryptedFolder) Revert() {
|
|
f.doInSync(f.revert)
|
|
}
|
|
|
|
func (f *receiveEncryptedFolder) revert() error {
|
|
f.sl.Info("Reverting unexpected items")
|
|
|
|
f.setState(FolderScanning)
|
|
defer f.setState(FolderIdle)
|
|
|
|
batch := NewFileInfoBatch(func(fs []protocol.FileInfo) error {
|
|
f.updateLocalsFromScanning(fs)
|
|
return nil
|
|
})
|
|
|
|
var dirs []string
|
|
for fi, err := range itererr.Zip(f.db.AllLocalFiles(f.folderID, protocol.LocalDeviceID)) {
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := batch.FlushIfFull(); err != nil {
|
|
return err
|
|
}
|
|
|
|
if !fi.IsReceiveOnlyChanged() || fi.IsDeleted() {
|
|
continue
|
|
}
|
|
|
|
if fi.IsDirectory() {
|
|
dirs = append(dirs, fi.Name)
|
|
continue
|
|
}
|
|
|
|
if err := f.inWritableDir(f.mtimefs.Remove, fi.Name); err != nil && !fs.IsNotExist(err) {
|
|
f.newScanError(fi.Name, fmt.Errorf("deleting unexpected item: %w", err))
|
|
}
|
|
|
|
fi.SetDeleted(f.shortID)
|
|
// Set version to zero, such that we pull the global version in case
|
|
// this is a valid filename that was erroneously changed locally.
|
|
// Should already be zero from scanning, but lets be safe.
|
|
fi.Version = protocol.Vector{}
|
|
// Purposely not removing FlagLocalReceiveOnly as the deleted
|
|
// item should still not be sent in index updates. However being
|
|
// deleted, it will not show up as an unexpected file in the UI
|
|
// anymore.
|
|
batch.Append(fi)
|
|
}
|
|
|
|
f.revertHandleDirs(dirs)
|
|
|
|
if err := batch.Flush(); err != nil {
|
|
return err
|
|
}
|
|
|
|
// We might need to pull items if the local changes were on valid, global files.
|
|
f.SchedulePull()
|
|
|
|
return nil
|
|
}
|
|
|
|
func (f *receiveEncryptedFolder) revertHandleDirs(dirs []string) {
|
|
if len(dirs) == 0 {
|
|
return
|
|
}
|
|
|
|
scanChan := make(chan string)
|
|
go f.pullScannerRoutine(scanChan)
|
|
defer close(scanChan)
|
|
|
|
slices.SortFunc(dirs, func(a, b string) int {
|
|
return strings.Compare(b, a)
|
|
})
|
|
for _, dir := range dirs {
|
|
if err := f.deleteDirOnDisk(dir, scanChan); err != nil {
|
|
f.newScanError(dir, fmt.Errorf("deleting unexpected dir: %w", err))
|
|
}
|
|
scanChan <- dir
|
|
}
|
|
}
|