This makes a couple of small improvements to the folder summary mechanism: - The folder summary includes the local and remote sequence numbers in clear text, rather than some odd sum that I'm not sure what it was intended to represent. - The folder summary event is generated when appropriate, regardless of whether there is an event listener. We did this before because generating it was expensive, and we wanted to avoid doing it unnecessarily. Nowadays, however, it's mostly just reading out pre-calculated metadata, and anyway, it's nice if it shows up reliably when running with -verbose. The point of all this is to make it easier to use these events to judge when devices are, in fact, in sync. As-is, if I'm looking at two devices, it's very difficult to reliably determine if they are in sync or not. The reason is that while we can ask device A if it thinks it's in sync, we can't see if the answer is "yes" because it has processed all changes from B, or if it just doesn't know about the changes from B yet. With proper sequence numbers in the event we can compare the two and determine the truth. This makes testing a lot easier.
193 lines
6.3 KiB
Go
193 lines
6.3 KiB
Go
// Copyright (C) 2015 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 syncthing
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"regexp"
|
|
|
|
"github.com/syncthing/syncthing/lib/events"
|
|
"github.com/syncthing/syncthing/lib/model"
|
|
)
|
|
|
|
// The verbose logging service subscribes to events and prints these in
|
|
// verbose format to the console using INFO level.
|
|
type verboseService struct {
|
|
evLogger events.Logger
|
|
}
|
|
|
|
func newVerboseService(evLogger events.Logger) *verboseService {
|
|
return &verboseService{
|
|
evLogger: evLogger,
|
|
}
|
|
}
|
|
|
|
// serve runs the verbose logging service.
|
|
func (s *verboseService) Serve(ctx context.Context) error {
|
|
sub := s.evLogger.Subscribe(events.AllEvents)
|
|
defer sub.Unsubscribe()
|
|
for {
|
|
select {
|
|
case ev, ok := <-sub.C():
|
|
if !ok {
|
|
<-ctx.Done()
|
|
return ctx.Err()
|
|
}
|
|
formatted := s.formatEvent(ev)
|
|
if formatted != "" {
|
|
l.Verboseln(formatted)
|
|
}
|
|
case <-ctx.Done():
|
|
return ctx.Err()
|
|
}
|
|
}
|
|
}
|
|
|
|
var folderSummaryRemoveDeprecatedRe = regexp.MustCompile(`(Invalid|IgnorePatterns|StateChanged):\S+\s?`)
|
|
|
|
func (*verboseService) formatEvent(ev events.Event) string {
|
|
switch ev.Type {
|
|
case events.DownloadProgress:
|
|
// Skip
|
|
return ""
|
|
|
|
case events.Starting:
|
|
return fmt.Sprintf("Starting up (%s)", ev.Data.(map[string]string)["home"])
|
|
|
|
case events.StartupComplete:
|
|
return "Startup complete"
|
|
|
|
case events.DeviceDiscovered:
|
|
data := ev.Data.(map[string]interface{})
|
|
return fmt.Sprintf("Discovered device %v at %v", data["device"], data["addrs"])
|
|
|
|
case events.DeviceConnected:
|
|
data := ev.Data.(map[string]string)
|
|
return fmt.Sprintf("Connected to device %v at %v (type %s)", data["id"], data["addr"], data["type"])
|
|
|
|
case events.DeviceDisconnected:
|
|
data := ev.Data.(map[string]string)
|
|
return fmt.Sprintf("Disconnected from device %v", data["id"])
|
|
|
|
case events.StateChanged:
|
|
data := ev.Data.(map[string]interface{})
|
|
return fmt.Sprintf("Folder %q is now %v", data["folder"], data["to"])
|
|
|
|
case events.LocalChangeDetected:
|
|
data := ev.Data.(map[string]string)
|
|
return fmt.Sprintf("Local change detected in folder %q: %s %s %s", data["folder"], data["action"], data["type"], data["path"])
|
|
|
|
case events.RemoteChangeDetected:
|
|
data := ev.Data.(map[string]string)
|
|
return fmt.Sprintf("Remote change detected in folder %q: %s %s %s", data["folder"], data["action"], data["type"], data["path"])
|
|
|
|
case events.LocalIndexUpdated:
|
|
data := ev.Data.(map[string]interface{})
|
|
return fmt.Sprintf("Local index update for %q with %d items (seq: %d)", data["folder"], data["items"], data["sequence"])
|
|
|
|
case events.RemoteIndexUpdated:
|
|
data := ev.Data.(map[string]interface{})
|
|
return fmt.Sprintf("Device %v sent an index update for %q with %d items (seq: %d)", data["device"], data["folder"], data["items"], data["sequence"])
|
|
|
|
case events.DeviceRejected:
|
|
data := ev.Data.(map[string]string)
|
|
return fmt.Sprintf("Rejected connection from device %v at %v", data["device"], data["address"])
|
|
|
|
case events.FolderRejected:
|
|
data := ev.Data.(map[string]string)
|
|
return fmt.Sprintf("Rejected unshared folder %q from device %v", data["folder"], data["device"])
|
|
|
|
case events.ItemStarted:
|
|
data := ev.Data.(map[string]string)
|
|
return fmt.Sprintf("Started syncing %q / %q (%v %v)", data["folder"], data["item"], data["action"], data["type"])
|
|
|
|
case events.ItemFinished:
|
|
data := ev.Data.(map[string]interface{})
|
|
if err, ok := data["error"].(*string); ok && err != nil {
|
|
// If the err interface{} is not nil, it is a string pointer.
|
|
// Dereference it to get the actual error or Sprintf will print
|
|
// the pointer value....
|
|
return fmt.Sprintf("Finished syncing %q / %q (%v %v): %v", data["folder"], data["item"], data["action"], data["type"], *err)
|
|
}
|
|
return fmt.Sprintf("Finished syncing %q / %q (%v %v): Success", data["folder"], data["item"], data["action"], data["type"])
|
|
|
|
case events.ConfigSaved:
|
|
return "Configuration was saved"
|
|
|
|
case events.FolderCompletion:
|
|
data := ev.Data.(map[string]interface{})
|
|
return fmt.Sprintf("Completion for folder %q on device %v is %v%% (state: %s, seq: %d)", data["folder"], data["device"], data["completion"], data["remoteState"], data["sequence"])
|
|
|
|
case events.FolderSummary:
|
|
data := ev.Data.(model.FolderSummaryEventData)
|
|
return folderSummaryRemoveDeprecatedRe.ReplaceAllString(fmt.Sprintf("Summary for folder %q is %+v", data.Folder, data.Summary), "")
|
|
|
|
case events.FolderScanProgress:
|
|
data := ev.Data.(map[string]interface{})
|
|
folder := data["folder"].(string)
|
|
current := data["current"].(int64)
|
|
total := data["total"].(int64)
|
|
rate := data["rate"].(float64) / 1024 / 1024
|
|
var pct int64
|
|
if total > 0 {
|
|
pct = 100 * current / total
|
|
}
|
|
return fmt.Sprintf("Scanning folder %q, %d%% done (%.01f MiB/s)", folder, pct, rate)
|
|
|
|
case events.DevicePaused:
|
|
data := ev.Data.(map[string]string)
|
|
device := data["device"]
|
|
return fmt.Sprintf("Device %v was paused", device)
|
|
|
|
case events.DeviceResumed:
|
|
data := ev.Data.(map[string]string)
|
|
device := data["device"]
|
|
return fmt.Sprintf("Device %v was resumed", device)
|
|
|
|
case events.ClusterConfigReceived:
|
|
data := ev.Data.(model.ClusterConfigReceivedEventData)
|
|
return fmt.Sprintf("Received ClusterConfig from device %v", data.Device)
|
|
|
|
case events.FolderPaused:
|
|
data := ev.Data.(map[string]string)
|
|
id := data["id"]
|
|
label := data["label"]
|
|
return fmt.Sprintf("Folder %v (%v) was paused", id, label)
|
|
|
|
case events.FolderResumed:
|
|
data := ev.Data.(map[string]string)
|
|
id := data["id"]
|
|
label := data["label"]
|
|
return fmt.Sprintf("Folder %v (%v) was resumed", id, label)
|
|
|
|
case events.ListenAddressesChanged:
|
|
data := ev.Data.(map[string]interface{})
|
|
address := data["address"]
|
|
lan := data["lan"]
|
|
wan := data["wan"]
|
|
return fmt.Sprintf("Listen address %s resolution has changed: lan addresses: %s wan addresses: %s", address, lan, wan)
|
|
|
|
case events.LoginAttempt:
|
|
data := ev.Data.(map[string]interface{})
|
|
username := data["username"].(string)
|
|
var success string
|
|
if data["success"].(bool) {
|
|
success = "successful"
|
|
} else {
|
|
success = "failed"
|
|
}
|
|
return fmt.Sprintf("Login %s for username %s.", success, username)
|
|
}
|
|
|
|
return fmt.Sprintf("%s %#v", ev.Type, ev)
|
|
}
|
|
|
|
func (s *verboseService) String() string {
|
|
return fmt.Sprintf("verboseService@%p", s)
|
|
}
|