diff options
author | tomasz1986 <twilczynski@naver.com> | 2023-03-18 08:50:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-18 08:50:38 +0100 |
commit | 358cf25cffe7b7586f1ded3f0ce27309fec2698e (patch) | |
tree | 2f870c7d82e930e88b653550f189c8d6f09688a7 | |
parent | 59de7048bdba815fe2f4e36e623bae97c5588e41 (diff) |
lib/config: Allow sub-second watcher delay (fixes #7859) (#7864)
Allow the watcher delay to take fractional values, effectively allowing
for much shorter delays. The minimum value is limited at 0.01, which
effectively translates to 10ms. This is required in order to guarantee
that there is still enough time to aggregate multiple single change
events.
Signed-off-by: Tomasz WilczyĆski <twilczynski@naver.com>
-rw-r--r-- | lib/config/folderconfiguration.go | 2 | ||||
-rw-r--r-- | lib/config/folderconfiguration.pb.go | 335 | ||||
-rw-r--r-- | lib/ur/usage_report.go | 3 | ||||
-rw-r--r-- | lib/watchaggregator/aggregator.go | 10 | ||||
-rw-r--r-- | proto/lib/config/folderconfiguration.proto | 2 |
5 files changed, 174 insertions, 178 deletions
diff --git a/lib/config/folderconfiguration.go b/lib/config/folderconfiguration.go index defeab4c55..2ef4190ff1 100644 --- a/lib/config/folderconfiguration.go +++ b/lib/config/folderconfiguration.go @@ -198,6 +198,8 @@ func (f *FolderConfiguration) prepare(myID protocol.DeviceID, existingDevices ma if f.FSWatcherDelayS <= 0 { f.FSWatcherEnabled = false f.FSWatcherDelayS = 10 + } else if f.FSWatcherDelayS < 0.01 { + f.FSWatcherDelayS = 0.01 } if f.Versioning.CleanupIntervalS > MaxRescanIntervalS { diff --git a/lib/config/folderconfiguration.pb.go b/lib/config/folderconfiguration.pb.go index b854448001..444a84c2c1 100644 --- a/lib/config/folderconfiguration.pb.go +++ b/lib/config/folderconfiguration.pb.go @@ -74,7 +74,7 @@ type FolderConfiguration struct { Devices []FolderDeviceConfiguration `protobuf:"bytes,6,rep,name=devices,proto3" json:"devices" xml:"device"` RescanIntervalS int `protobuf:"varint,7,opt,name=rescan_interval_s,json=rescanIntervalS,proto3,casttype=int" json:"rescanIntervalS" xml:"rescanIntervalS,attr" default:"3600"` FSWatcherEnabled bool `protobuf:"varint,8,opt,name=fs_watcher_enabled,json=fsWatcherEnabled,proto3" json:"fsWatcherEnabled" xml:"fsWatcherEnabled,attr" default:"true"` - FSWatcherDelayS int `protobuf:"varint,9,opt,name=fs_watcher_delay_s,json=fsWatcherDelayS,proto3,casttype=int" json:"fsWatcherDelayS" xml:"fsWatcherDelayS,attr" default:"10"` + FSWatcherDelayS float64 `protobuf:"fixed64,9,opt,name=fs_watcher_delay_s,json=fsWatcherDelayS,proto3" json:"fsWatcherDelayS" xml:"fsWatcherDelayS,attr" default:"10"` IgnorePerms bool `protobuf:"varint,10,opt,name=ignore_perms,json=ignorePerms,proto3" json:"ignorePerms" xml:"ignorePerms,attr"` AutoNormalize bool `protobuf:"varint,11,opt,name=auto_normalize,json=autoNormalize,proto3" json:"autoNormalize" xml:"autoNormalize,attr" default:"true"` MinDiskFree Size `protobuf:"bytes,12,opt,name=min_disk_free,json=minDiskFree,proto3" json:"minDiskFree" xml:"minDiskFree" default:"1 %"` @@ -240,158 +240,158 @@ func init() { } var fileDescriptor_44a9785876ed3afa = []byte{ - // 2407 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xcd, 0x6f, 0x1b, 0xc7, - 0x15, 0xd7, 0x4a, 0xb6, 0x25, 0x8d, 0xbe, 0x47, 0x96, 0xbd, 0x51, 0x12, 0x8d, 0xb2, 0xa1, 0x63, - 0x25, 0x4d, 0x64, 0x5b, 0x31, 0x02, 0xc4, 0xa8, 0xdb, 0x86, 0x92, 0x85, 0xba, 0xae, 0x62, 0x61, - 0xa9, 0xd6, 0x6d, 0x52, 0x60, 0xbb, 0xda, 0x1d, 0x92, 0x1b, 0xed, 0x07, 0xbb, 0xb3, 0xb2, 0x44, - 0x1f, 0x02, 0xb7, 0x87, 0xa2, 0x45, 0x73, 0x28, 0xd4, 0x43, 0x91, 0x43, 0x81, 0x00, 0x2d, 0x8a, - 0x36, 0xfd, 0x03, 0x0a, 0xf4, 0x2f, 0xf0, 0xa5, 0x90, 0x4e, 0x45, 0xd1, 0xc3, 0x00, 0x91, 0x6f, - 0x3c, 0xf2, 0xe8, 0x53, 0xf1, 0xde, 0x7e, 0x70, 0x96, 0x64, 0x80, 0x02, 0xbd, 0x71, 0x7e, 0xbf, - 0x37, 0xef, 0xfd, 0xf6, 0xcd, 0xcc, 0x9b, 0x37, 0x24, 0x15, 0xdf, 0xdb, 0xbf, 0xe1, 0x44, 0x61, - 0xdd, 0x6b, 0xdc, 0xa8, 0x47, 0xbe, 0xcb, 0xe3, 0x74, 0x70, 0x18, 0xdb, 0x89, 0x17, 0x85, 0xeb, - 0xad, 0x38, 0x4a, 0x22, 0x7a, 0x29, 0x05, 0x97, 0x5f, 0x1e, 0xb0, 0x4e, 0xda, 0x2d, 0x9e, 0x1a, - 0x2d, 0x2f, 0x29, 0xa4, 0xf0, 0x9e, 0xe4, 0xf0, 0xb2, 0x02, 0xb7, 0x0e, 0x7d, 0x3f, 0x8a, 0x5d, - 0x1e, 0x67, 0xdc, 0x9a, 0xc2, 0x3d, 0xe6, 0xb1, 0xf0, 0xa2, 0xd0, 0x0b, 0x1b, 0x43, 0x14, 0x2c, - 0x33, 0xc5, 0x72, 0xdf, 0x8f, 0x9c, 0x83, 0x7e, 0x57, 0x14, 0x0c, 0xea, 0xe2, 0x06, 0x08, 0x12, - 0x19, 0xf6, 0x4a, 0x86, 0x39, 0x51, 0xab, 0x1d, 0xdb, 0x61, 0x83, 0x07, 0x3c, 0x69, 0x46, 0x6e, - 0xc6, 0x4e, 0xf2, 0xe3, 0x24, 0xfd, 0x69, 0xfc, 0x6b, 0x8c, 0xbc, 0xb4, 0x8d, 0xdf, 0xb3, 0xc5, - 0x1f, 0x7b, 0x0e, 0xdf, 0x54, 0x15, 0xd0, 0x2f, 0x35, 0x32, 0xe9, 0x22, 0x6e, 0x79, 0xae, 0xae, - 0xad, 0x6a, 0x6b, 0xd3, 0xd5, 0xcf, 0xb4, 0x67, 0x92, 0x8d, 0xfc, 0x47, 0xb2, 0xdb, 0x0d, 0x2f, - 0x69, 0x1e, 0xee, 0xaf, 0x3b, 0x51, 0x70, 0x43, 0xb4, 0x43, 0x27, 0x69, 0x7a, 0x61, 0x43, 0xf9, - 0x05, 0x12, 0x30, 0x88, 0x13, 0xf9, 0xeb, 0xa9, 0xf7, 0xfb, 0x5b, 0xe7, 0x92, 0x4d, 0xe4, 0xbf, - 0x3b, 0x92, 0x4d, 0xb8, 0xd9, 0xef, 0xae, 0x64, 0x33, 0xc7, 0x81, 0x7f, 0xc7, 0xf0, 0xdc, 0xb7, - 0xed, 0x24, 0x89, 0x8d, 0xce, 0x69, 0x65, 0x3c, 0xfb, 0xdd, 0x3d, 0xad, 0x14, 0x76, 0xbf, 0x3a, - 0xab, 0x68, 0x27, 0x67, 0x95, 0xc2, 0x87, 0x99, 0x33, 0x2e, 0xfd, 0xb3, 0x46, 0x66, 0xbc, 0x30, - 0x89, 0x23, 0xf7, 0xd0, 0xe1, 0xae, 0xb5, 0xdf, 0xd6, 0x47, 0x51, 0xf0, 0xd3, 0xff, 0x4b, 0x70, - 0x47, 0xb2, 0xe9, 0x9e, 0xd7, 0x6a, 0xbb, 0x2b, 0xd9, 0xd5, 0x54, 0xa8, 0x02, 0x16, 0x92, 0x17, - 0x06, 0x50, 0x10, 0x6c, 0x96, 0x3c, 0x50, 0x87, 0x2c, 0xf2, 0xd0, 0x89, 0xdb, 0x2d, 0xc8, 0xb1, - 0xd5, 0xb2, 0x85, 0x38, 0x8a, 0x62, 0x57, 0x1f, 0x5b, 0xd5, 0xd6, 0x26, 0xab, 0x1b, 0x1d, 0xc9, - 0x68, 0x8f, 0xde, 0xcd, 0xd8, 0xae, 0x64, 0x3a, 0x86, 0x1d, 0xa4, 0x0c, 0x73, 0x88, 0xbd, 0xf1, - 0x79, 0x85, 0x2c, 0xa6, 0x0b, 0x5b, 0x5e, 0xd2, 0x1a, 0x19, 0xcd, 0x96, 0x72, 0xb2, 0xba, 0x79, - 0x2e, 0xd9, 0x28, 0x7e, 0xe2, 0xa8, 0x07, 0x11, 0x56, 0x4a, 0x2b, 0xb0, 0x1a, 0x46, 0x2e, 0xaf, - 0xdb, 0x87, 0x7e, 0x72, 0xc7, 0x48, 0xe2, 0x43, 0xae, 0x2e, 0xc9, 0xc9, 0x59, 0x65, 0xf4, 0xfe, - 0xd6, 0x17, 0xf0, 0x6d, 0xa3, 0x9e, 0x4b, 0x7f, 0x40, 0x2e, 0xfa, 0xf6, 0x3e, 0xf7, 0x31, 0xe3, - 0x93, 0xd5, 0x6f, 0x77, 0x24, 0x4b, 0x81, 0xae, 0x64, 0xab, 0xe8, 0x14, 0x47, 0x99, 0xdf, 0x98, - 0x8b, 0xc4, 0x8e, 0x93, 0x3b, 0x46, 0xdd, 0xf6, 0x05, 0xba, 0x25, 0x3d, 0xfa, 0xe9, 0x59, 0x65, - 0xc4, 0x4c, 0x27, 0xd3, 0x06, 0x99, 0xab, 0x7b, 0x3e, 0x17, 0x6d, 0x91, 0xf0, 0xc0, 0x82, 0xfd, - 0x8d, 0x49, 0x9a, 0xdd, 0xa0, 0xeb, 0x75, 0xb1, 0xbe, 0x5d, 0x50, 0x7b, 0xed, 0x16, 0xaf, 0xbe, - 0xd5, 0x91, 0x6c, 0xb6, 0x5e, 0xc2, 0xba, 0x92, 0x5d, 0xc6, 0xe8, 0x65, 0xd8, 0x30, 0xfb, 0xec, - 0xe8, 0x0e, 0xb9, 0xd0, 0xb2, 0x93, 0xa6, 0x7e, 0x01, 0xe5, 0xbf, 0xdf, 0x91, 0x0c, 0xc7, 0x5d, - 0xc9, 0x5e, 0xc6, 0xf9, 0x30, 0xc8, 0xc4, 0x17, 0x29, 0xf9, 0x14, 0x84, 0x4f, 0x16, 0xcc, 0x8b, - 0xd3, 0x8a, 0xf6, 0xa9, 0x89, 0xd3, 0xe8, 0x2e, 0xb9, 0x80, 0x62, 0x2f, 0x66, 0x62, 0xd3, 0xd3, - 0xbb, 0x9e, 0x2e, 0x07, 0x8a, 0x5d, 0x83, 0x10, 0x49, 0x2a, 0x71, 0x0e, 0x43, 0xc0, 0xa0, 0xd8, - 0x46, 0x93, 0xc5, 0xc8, 0x44, 0x2b, 0xfa, 0x13, 0x32, 0x9e, 0xee, 0x73, 0xa1, 0x5f, 0x5a, 0x1d, - 0x5b, 0x9b, 0xda, 0x78, 0xad, 0xec, 0x74, 0xc8, 0xe1, 0xad, 0x32, 0xd8, 0xf6, 0x1d, 0xc9, 0xf2, - 0x99, 0x5d, 0xc9, 0xa6, 0x31, 0x54, 0x3a, 0x36, 0xcc, 0x9c, 0xa0, 0xbf, 0xd3, 0xc8, 0x42, 0xcc, - 0x85, 0x63, 0x87, 0x96, 0x17, 0x26, 0x3c, 0x7e, 0x6c, 0xfb, 0x96, 0xd0, 0xc7, 0x57, 0xb5, 0xb5, - 0x8b, 0xd5, 0x46, 0x47, 0xb2, 0xb9, 0x94, 0xbc, 0x9f, 0x71, 0xb5, 0xae, 0x64, 0x6f, 0xa2, 0xa7, - 0x3e, 0xbc, 0x3f, 0x45, 0xef, 0xbe, 0x77, 0xf3, 0xa6, 0xf1, 0x42, 0xb2, 0x31, 0x2f, 0x4c, 0x3a, - 0xa7, 0x95, 0xcb, 0xc3, 0xcc, 0x5f, 0x9c, 0x56, 0x2e, 0x80, 0x9d, 0xd9, 0x1f, 0x84, 0xfe, 0x43, - 0x23, 0xb4, 0x2e, 0xac, 0x23, 0x3b, 0x71, 0x9a, 0x3c, 0xb6, 0x78, 0x68, 0xef, 0xfb, 0xdc, 0xd5, - 0x27, 0x56, 0xb5, 0xb5, 0x89, 0xea, 0x6f, 0xb4, 0x73, 0xc9, 0xe6, 0xb7, 0x6b, 0x8f, 0x52, 0xf6, - 0x5e, 0x4a, 0x76, 0x24, 0x9b, 0xaf, 0x8b, 0x32, 0xd6, 0x95, 0xec, 0xad, 0x74, 0x13, 0xf4, 0x11, - 0xfd, 0x6a, 0xf3, 0x3d, 0xbe, 0x34, 0xd4, 0x10, 0x74, 0x82, 0xc5, 0xc9, 0x59, 0x65, 0x20, 0xac, - 0x39, 0x10, 0x94, 0xfe, 0xbd, 0x2c, 0xde, 0xe5, 0xbe, 0xdd, 0xb6, 0x84, 0x3e, 0x89, 0x39, 0xfd, - 0x35, 0x88, 0x9f, 0x2b, 0xbc, 0x6c, 0x01, 0x59, 0x83, 0x3c, 0x17, 0x6e, 0x52, 0xa8, 0x2b, 0xd9, - 0xf5, 0xb2, 0xf4, 0x14, 0xef, 0x57, 0x7e, 0xab, 0x94, 0xe5, 0x61, 0xc6, 0x2f, 0x4e, 0x2b, 0xa3, - 0xb7, 0x6e, 0x9e, 0x9c, 0x55, 0xfa, 0xa3, 0x9a, 0xfd, 0x31, 0xe9, 0x4f, 0xc9, 0xb4, 0xd7, 0x08, - 0xa3, 0x98, 0x5b, 0x2d, 0x1e, 0x07, 0x42, 0x27, 0x98, 0xef, 0xbb, 0x1d, 0xc9, 0xa6, 0x52, 0x7c, - 0x17, 0xe0, 0xae, 0x64, 0x57, 0xd2, 0x6a, 0xd1, 0xc3, 0x8a, 0xed, 0x3b, 0xdf, 0x0f, 0x9a, 0xea, - 0x54, 0xfa, 0x73, 0x8d, 0xcc, 0xda, 0x87, 0x49, 0x64, 0x85, 0x51, 0x1c, 0xd8, 0xbe, 0xf7, 0x84, - 0xeb, 0x53, 0x18, 0xe4, 0xa3, 0x8e, 0x64, 0x33, 0xc0, 0x7c, 0x98, 0x13, 0x45, 0x06, 0x4a, 0xe8, - 0xd7, 0xad, 0x1c, 0x1d, 0xb4, 0xca, 0x97, 0xcd, 0x2c, 0xfb, 0xa5, 0x11, 0x99, 0x09, 0xbc, 0xd0, - 0x72, 0x3d, 0x71, 0x60, 0xd5, 0x63, 0xce, 0xf5, 0xe9, 0x55, 0x6d, 0x6d, 0x6a, 0x63, 0x3a, 0x3f, - 0x56, 0x35, 0xef, 0x09, 0xaf, 0xde, 0xcd, 0x4e, 0xd0, 0x54, 0xe0, 0x85, 0x5b, 0x9e, 0x38, 0xd8, - 0x8e, 0x39, 0x28, 0x62, 0xa8, 0x48, 0xc1, 0xd4, 0xa5, 0x58, 0xbd, 0x66, 0xbc, 0x38, 0xad, 0x8c, - 0xdd, 0x5a, 0xbd, 0x66, 0xaa, 0xd3, 0x68, 0x83, 0x90, 0xde, 0x3d, 0xaf, 0xcf, 0x60, 0x34, 0x96, - 0x47, 0xfb, 0x61, 0xc1, 0x94, 0x8f, 0xf0, 0x1b, 0x99, 0x00, 0x65, 0x6a, 0x57, 0xb2, 0x79, 0x8c, - 0xdf, 0x83, 0x0c, 0x53, 0xe1, 0xe9, 0x5d, 0x32, 0xee, 0x44, 0x2d, 0x8f, 0xc7, 0x42, 0x9f, 0xc5, - 0xdd, 0xf6, 0x3a, 0xd4, 0x80, 0x0c, 0x2a, 0xae, 0xd9, 0x6c, 0x9c, 0xef, 0x1b, 0x33, 0x37, 0xa0, - 0xff, 0xd4, 0xc8, 0x15, 0xe8, 0x30, 0x78, 0x6c, 0x05, 0xf6, 0xb1, 0xd5, 0xe2, 0xa1, 0xeb, 0x85, - 0x0d, 0xeb, 0xc0, 0xdb, 0xd7, 0xe7, 0xd0, 0xdd, 0xef, 0x61, 0xf3, 0x2e, 0xee, 0xa2, 0xc9, 0x8e, - 0x7d, 0xbc, 0x9b, 0x1a, 0x3c, 0xf0, 0xaa, 0x1d, 0xc9, 0x16, 0x5b, 0x83, 0x70, 0x57, 0xb2, 0x97, - 0xd2, 0x22, 0x3a, 0xc8, 0x29, 0xdb, 0x76, 0xe8, 0xd4, 0xe1, 0xf0, 0xc9, 0x59, 0x65, 0x58, 0x7c, - 0x73, 0x88, 0xed, 0x3e, 0xa4, 0xa3, 0x69, 0x8b, 0x26, 0xa4, 0x63, 0xbe, 0x97, 0x8e, 0x0c, 0x2a, - 0xd2, 0x91, 0x8d, 0x7b, 0xe9, 0xc8, 0x00, 0xfa, 0x01, 0xb9, 0x88, 0xbd, 0x96, 0xbe, 0x80, 0xb5, - 0x7c, 0x21, 0x5f, 0x31, 0x88, 0xff, 0x10, 0x88, 0xaa, 0x0e, 0x97, 0x1d, 0xda, 0x74, 0x25, 0x9b, - 0x42, 0x6f, 0x38, 0x32, 0xcc, 0x14, 0xa5, 0x0f, 0xc8, 0x4c, 0x76, 0xa0, 0x5c, 0xee, 0xf3, 0x84, - 0xeb, 0x14, 0x37, 0xfb, 0x1b, 0xd8, 0x59, 0x20, 0xb1, 0x85, 0x78, 0x57, 0x32, 0xaa, 0x1c, 0xa9, - 0x14, 0x34, 0xcc, 0x92, 0x0d, 0x3d, 0x26, 0x3a, 0xd6, 0xe9, 0x56, 0x1c, 0x35, 0x62, 0x2e, 0x84, - 0x5a, 0xb0, 0x17, 0xf1, 0xfb, 0xe0, 0xf2, 0x5d, 0x02, 0x9b, 0xdd, 0xcc, 0x44, 0x2d, 0xdb, 0xe9, - 0x75, 0x36, 0x94, 0x2d, 0xbe, 0x7d, 0xf8, 0x64, 0x5a, 0x23, 0xb3, 0xd9, 0xbe, 0x68, 0xd9, 0x87, - 0x82, 0x5b, 0x42, 0xbf, 0x8c, 0xf1, 0xde, 0x81, 0xef, 0x48, 0x99, 0x5d, 0x20, 0x6a, 0xc5, 0x77, - 0xa8, 0x60, 0xe1, 0xbd, 0x64, 0x4a, 0x39, 0x99, 0x81, 0x5d, 0x06, 0x49, 0xf5, 0x3d, 0x27, 0x11, - 0xfa, 0x12, 0xfa, 0xfc, 0x0e, 0xf8, 0x0c, 0xec, 0xe3, 0xcd, 0x1c, 0xef, 0x9d, 0x3a, 0x05, 0x1c, - 0x5a, 0x01, 0xd3, 0x4a, 0x67, 0x96, 0x66, 0x53, 0x97, 0x5c, 0x76, 0x3d, 0x01, 0x95, 0xd9, 0x12, - 0x2d, 0x3b, 0x16, 0xdc, 0xc2, 0x06, 0x40, 0xbf, 0x82, 0x2b, 0x81, 0x2d, 0x57, 0xc6, 0xd7, 0x90, - 0xc6, 0xd6, 0xa2, 0x68, 0xb9, 0x06, 0x29, 0xc3, 0x1c, 0x62, 0xaf, 0x46, 0x49, 0x78, 0xd0, 0xb2, - 0xbc, 0xd0, 0xe5, 0xc7, 0x5c, 0xe8, 0x57, 0x07, 0xa2, 0xec, 0xf1, 0xa0, 0x75, 0x3f, 0x65, 0xfb, - 0xa3, 0x28, 0x54, 0x2f, 0x8a, 0x02, 0xd2, 0x0d, 0x72, 0x09, 0x17, 0xc0, 0xd5, 0x75, 0xf4, 0xbb, - 0xdc, 0x91, 0x2c, 0x43, 0x8a, 0x1b, 0x3e, 0x1d, 0x1a, 0x66, 0x86, 0xd3, 0x84, 0x5c, 0x3d, 0xe2, - 0xf6, 0x81, 0x05, 0xbb, 0xda, 0x4a, 0x9a, 0x31, 0x17, 0xcd, 0xc8, 0x77, 0xad, 0x96, 0x93, 0xe8, - 0x2f, 0x61, 0xc2, 0xa1, 0xbc, 0x5f, 0x06, 0x93, 0xef, 0xda, 0xa2, 0xb9, 0x97, 0x1b, 0xec, 0x3a, - 0x49, 0x57, 0xb2, 0x65, 0x74, 0x39, 0x8c, 0x2c, 0x16, 0x75, 0xe8, 0x54, 0xba, 0x49, 0xa6, 0x02, - 0x3b, 0x3e, 0xe0, 0xb1, 0x15, 0xda, 0x01, 0xd7, 0x97, 0xb1, 0xb9, 0x32, 0xa0, 0x9c, 0xa5, 0xf0, - 0x87, 0x76, 0xc0, 0x8b, 0x72, 0xd6, 0x83, 0x0c, 0x53, 0xe1, 0x69, 0x9b, 0x2c, 0xc3, 0x23, 0xc6, - 0x8a, 0x8e, 0x42, 0x1e, 0x8b, 0xa6, 0xd7, 0xb2, 0xea, 0x71, 0x14, 0x58, 0x2d, 0x3b, 0xe6, 0x61, - 0xa2, 0xbf, 0x8c, 0x29, 0xf8, 0x66, 0x47, 0xb2, 0xab, 0x60, 0xf5, 0x30, 0x37, 0xda, 0x8e, 0xa3, - 0x60, 0x17, 0x4d, 0xba, 0x92, 0xbd, 0x9a, 0x57, 0xbc, 0x61, 0xbc, 0x61, 0x7e, 0xdd, 0x4c, 0xfa, - 0x4b, 0x8d, 0x2c, 0x04, 0x91, 0x6b, 0x25, 0x5e, 0xc0, 0xad, 0x23, 0x2f, 0x74, 0xa3, 0x23, 0x4b, - 0xe8, 0xaf, 0x60, 0xc2, 0x3e, 0x3e, 0x97, 0x6c, 0xc1, 0xb4, 0x8f, 0x76, 0x22, 0x77, 0xcf, 0x0b, - 0xf8, 0x23, 0x64, 0xe1, 0x0e, 0x9f, 0x0d, 0x4a, 0x48, 0xd1, 0x82, 0x96, 0xe1, 0x3c, 0x73, 0x27, - 0x67, 0x95, 0x41, 0x2f, 0x66, 0x9f, 0x0f, 0xfa, 0x54, 0x23, 0x4b, 0xd9, 0x31, 0x71, 0x0e, 0x63, - 0xd0, 0x66, 0x1d, 0xc5, 0x5e, 0xc2, 0x85, 0xfe, 0x2a, 0x8a, 0xf9, 0x3e, 0x94, 0xde, 0x74, 0xc3, - 0x67, 0xfc, 0x23, 0xa4, 0xbb, 0x92, 0x5d, 0x53, 0x4e, 0x4d, 0x89, 0x53, 0x0e, 0xcf, 0x86, 0x72, - 0x76, 0xb4, 0x0d, 0x73, 0x98, 0x27, 0x28, 0x62, 0xf9, 0xde, 0xae, 0xc3, 0x8b, 0x49, 0x5f, 0xe9, - 0x15, 0xb1, 0x8c, 0xd8, 0x06, 0xbc, 0x38, 0xfc, 0x2a, 0x68, 0x98, 0x25, 0x1b, 0xea, 0x93, 0x79, - 0x7c, 0xc9, 0x5a, 0x50, 0x0b, 0xac, 0xb4, 0xbe, 0x32, 0xac, 0xaf, 0x57, 0xf2, 0xfa, 0x5a, 0x05, - 0xbe, 0x57, 0x64, 0xb1, 0xb9, 0xdf, 0x2f, 0x61, 0x45, 0x66, 0xcb, 0xb0, 0x61, 0xf6, 0xd9, 0xd1, - 0xcf, 0x34, 0xb2, 0x80, 0x5b, 0x08, 0x1f, 0xc2, 0x56, 0xfa, 0x12, 0xd6, 0x57, 0x31, 0xde, 0x22, - 0x3c, 0x24, 0x36, 0xa3, 0x56, 0xdb, 0x04, 0x6e, 0x07, 0xa9, 0xea, 0x03, 0x68, 0xc5, 0x9c, 0x32, - 0xd8, 0x95, 0x6c, 0xad, 0xd8, 0x46, 0x0a, 0xae, 0xa4, 0x51, 0x24, 0x76, 0xe8, 0xda, 0xb1, 0x0b, - 0xf7, 0xff, 0x44, 0x3e, 0x30, 0xfb, 0x1d, 0xd1, 0x3f, 0x81, 0x1c, 0x1b, 0x0a, 0x28, 0x0f, 0x85, - 0x97, 0x78, 0x8f, 0x21, 0xa3, 0xfa, 0x6b, 0x98, 0xce, 0x63, 0xe8, 0x0b, 0x37, 0x6d, 0xc1, 0x6b, - 0x39, 0xb7, 0x8d, 0x7d, 0xa1, 0x53, 0x86, 0xba, 0x92, 0x2d, 0xa5, 0x62, 0xca, 0x38, 0xf4, 0x40, - 0x03, 0xb6, 0x83, 0x10, 0xb4, 0x81, 0x7d, 0x41, 0xcc, 0x3e, 0x1b, 0x41, 0xff, 0xa8, 0x91, 0xf9, - 0x7a, 0xe4, 0xfb, 0xd1, 0x91, 0xf5, 0xc9, 0x61, 0xe8, 0x40, 0x3b, 0x22, 0x74, 0xa3, 0xa7, 0xf2, - 0x7b, 0x39, 0xf8, 0x81, 0xd8, 0xf2, 0x62, 0x01, 0x2a, 0x3f, 0x29, 0x43, 0x85, 0xca, 0x3e, 0x1c, - 0x55, 0xf6, 0xdb, 0x0e, 0x42, 0xa0, 0xb2, 0x2f, 0x88, 0x39, 0x97, 0x2a, 0x2a, 0x60, 0xfa, 0x90, - 0xcc, 0xc2, 0x8e, 0xea, 0x55, 0x07, 0xfd, 0x75, 0x94, 0x08, 0xef, 0xab, 0x19, 0x60, 0x8a, 0x73, - 0xdd, 0x95, 0x6c, 0x31, 0xbd, 0xfc, 0x54, 0xd4, 0x30, 0xcb, 0x56, 0xe8, 0x90, 0x87, 0xae, 0xe2, - 0xb0, 0xa2, 0x38, 0xe4, 0xa1, 0x3b, 0xc4, 0xa1, 0x8a, 0x82, 0x43, 0x75, 0x0c, 0x45, 0x10, 0x15, - 0x1e, 0x43, 0x37, 0x2a, 0xf4, 0x6b, 0xe8, 0x0d, 0x8b, 0x20, 0xc0, 0x3f, 0x42, 0xb4, 0x28, 0x82, - 0x3d, 0xc8, 0x30, 0x15, 0x1e, 0x9d, 0x80, 0xaa, 0xcc, 0xc9, 0x1b, 0x8a, 0x13, 0x1e, 0xba, 0xfd, - 0x4e, 0x0a, 0x08, 0x9c, 0x14, 0x03, 0x68, 0xec, 0x71, 0x3e, 0xdc, 0x7d, 0x09, 0x8f, 0xf5, 0xeb, - 0xd8, 0x83, 0x2e, 0xe6, 0x27, 0x0e, 0xad, 0xb6, 0x91, 0xaa, 0xae, 0xe5, 0x8d, 0xef, 0x71, 0x0f, - 0xec, 0x4a, 0xb6, 0x80, 0xfe, 0x15, 0xcc, 0x30, 0x55, 0x0b, 0x7a, 0x40, 0x26, 0x63, 0x6e, 0xbb, - 0x56, 0x14, 0xfa, 0x6d, 0xfd, 0x2f, 0xdb, 0xa8, 0x72, 0xe7, 0x5c, 0x32, 0xba, 0xc5, 0x5b, 0x31, - 0x77, 0xec, 0x84, 0xbb, 0x26, 0xb7, 0xdd, 0x87, 0xa1, 0xdf, 0xee, 0x48, 0xa6, 0xbd, 0x53, 0xfc, - 0x97, 0x12, 0x47, 0xd8, 0xac, 0xbf, 0x1d, 0x05, 0x1e, 0xdc, 0x9c, 0x49, 0x1b, 0xff, 0x4b, 0x19, - 0x40, 0x75, 0xcd, 0x9c, 0x88, 0x33, 0x07, 0xf4, 0x67, 0x64, 0xa1, 0xd4, 0xc1, 0xe3, 0x6d, 0xf6, - 0x57, 0x08, 0xaa, 0x55, 0xef, 0x9d, 0x4b, 0xa6, 0xf7, 0x82, 0xee, 0xf4, 0xfa, 0xf0, 0x5d, 0x27, - 0xc9, 0x43, 0xaf, 0xf4, 0xb7, 0xf1, 0xbb, 0x4e, 0xa2, 0x28, 0xd0, 0x35, 0x73, 0xb6, 0x4c, 0xd2, - 0x1f, 0x93, 0xf1, 0xb4, 0x7b, 0x11, 0xfa, 0x97, 0xdb, 0x58, 0x79, 0xbf, 0x05, 0xd7, 0x40, 0x2f, - 0x50, 0xda, 0x95, 0x8a, 0xf2, 0xc7, 0x65, 0x53, 0x14, 0xd7, 0x59, 0xb9, 0xd5, 0x35, 0x33, 0xf7, - 0x47, 0x0f, 0xc8, 0x2c, 0xf6, 0x75, 0xbd, 0x7d, 0xf7, 0xb7, 0x34, 0x7f, 0x9b, 0xe7, 0x92, 0x5d, - 0xed, 0x45, 0xa8, 0x39, 0x76, 0x58, 0x6c, 0xae, 0x3c, 0xce, 0xab, 0x45, 0x57, 0x57, 0x50, 0xe5, - 0x0f, 0x99, 0x29, 0x71, 0xc6, 0x2f, 0xc6, 0xc8, 0x94, 0xb2, 0xdc, 0xf4, 0x63, 0x32, 0xce, 0xc3, - 0x24, 0xf6, 0xb8, 0xd0, 0x35, 0xfc, 0x77, 0x41, 0x1f, 0xb2, 0x29, 0xee, 0x85, 0x49, 0xdc, 0xae, - 0x5e, 0xcf, 0xff, 0x54, 0xc8, 0x26, 0x14, 0x3d, 0x2f, 0x8c, 0x71, 0xd9, 0x2e, 0xe2, 0x2f, 0x33, - 0x37, 0xa0, 0x9f, 0x67, 0x97, 0x97, 0xf0, 0xc2, 0x86, 0xcf, 0x2d, 0x64, 0x2d, 0x01, 0x8f, 0xbe, - 0x51, 0x4c, 0x61, 0x1d, 0xfa, 0xa2, 0xc0, 0x3e, 0xae, 0x21, 0x8f, 0x51, 0x6a, 0xea, 0xcb, 0x6f, - 0x90, 0x2a, 0xf5, 0x7d, 0x1b, 0xb7, 0x95, 0x47, 0xc4, 0x10, 0x3f, 0xf0, 0x00, 0x04, 0x2b, 0x73, - 0x08, 0x47, 0x9f, 0x90, 0x59, 0x90, 0x96, 0x44, 0x09, 0x34, 0xd0, 0xa0, 0x69, 0x0c, 0x35, 0xed, - 0x65, 0xfd, 0xe7, 0x1e, 0x10, 0x99, 0x9a, 0xd7, 0x72, 0x35, 0x05, 0xa8, 0xe8, 0xb8, 0x7d, 0xf3, - 0xfd, 0xf7, 0x14, 0x1d, 0xa5, 0xb9, 0xa0, 0x00, 0x78, 0xb3, 0x84, 0x1a, 0x7f, 0xd0, 0xc8, 0x7c, - 0x7f, 0x7a, 0xe1, 0xb9, 0x11, 0xc0, 0x6b, 0x3c, 0xfb, 0x83, 0xee, 0x1b, 0xf0, 0xb6, 0x40, 0x40, - 0xe9, 0x93, 0x12, 0xa7, 0x59, 0xbc, 0xb4, 0x49, 0x6f, 0x68, 0xa6, 0x86, 0x74, 0x9b, 0x5c, 0x82, - 0x87, 0xbb, 0x97, 0x60, 0x7e, 0x27, 0xaa, 0xeb, 0xd8, 0x1f, 0x22, 0x52, 0x1c, 0xe1, 0x74, 0x58, - 0x78, 0x99, 0x52, 0xc6, 0x66, 0x66, 0x5b, 0x7d, 0xf0, 0xec, 0xab, 0x95, 0x91, 0xb3, 0xaf, 0x56, - 0x46, 0x9e, 0x9d, 0xaf, 0x68, 0x67, 0xe7, 0x2b, 0xda, 0x6f, 0x9f, 0xaf, 0x8c, 0x7c, 0xf1, 0x7c, - 0x45, 0x3b, 0x7b, 0xbe, 0x32, 0xf2, 0xef, 0xe7, 0x2b, 0x23, 0x1f, 0xbd, 0xf9, 0x3f, 0xfc, 0x9f, - 0x9a, 0xee, 0xa3, 0xfd, 0x4b, 0xf8, 0xbf, 0xea, 0xbb, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x9a, - 0x47, 0x7c, 0xbb, 0x75, 0x17, 0x00, 0x00, + // 2413 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xcf, 0x6f, 0x24, 0x47, + 0xf5, 0x77, 0xdb, 0xbb, 0x6b, 0xbb, 0xfc, 0xbb, 0x6c, 0xef, 0x76, 0x9c, 0xc4, 0x35, 0xe9, 0xcc, + 0x26, 0x4e, 0xbe, 0x89, 0x77, 0xe3, 0x44, 0x91, 0x12, 0x7d, 0x03, 0x64, 0xec, 0x8c, 0x58, 0x16, + 0x67, 0xad, 0x1e, 0x43, 0x20, 0x41, 0x6a, 0xda, 0xdd, 0x35, 0x33, 0x1d, 0xf7, 0x8f, 0xa1, 0xab, + 0xbd, 0xf6, 0xec, 0x21, 0x0a, 0x39, 0x20, 0x24, 0x72, 0x40, 0xe6, 0x80, 0x38, 0x20, 0x45, 0x02, + 0x21, 0x08, 0x17, 0xce, 0xfc, 0x05, 0xb9, 0x20, 0xfb, 0x84, 0x10, 0x87, 0x92, 0xe2, 0xbd, 0xcd, + 0x71, 0x8e, 0x7b, 0x42, 0xef, 0xf5, 0x8f, 0xa9, 0x9e, 0x99, 0x48, 0x48, 0xdc, 0xa6, 0x3e, 0x9f, + 0x57, 0xef, 0x7d, 0xfa, 0x55, 0xd5, 0xab, 0x57, 0x43, 0xaa, 0xbe, 0x77, 0x74, 0xc7, 0x89, 0xc2, + 0xa6, 0xd7, 0xba, 0xd3, 0x8c, 0x7c, 0x97, 0xc7, 0xe9, 0xe0, 0x24, 0xb6, 0x13, 0x2f, 0x0a, 0xb7, + 0x3b, 0x71, 0x94, 0x44, 0xf4, 0x46, 0x0a, 0x6e, 0x3c, 0x3d, 0x62, 0x9d, 0x74, 0x3b, 0x3c, 0x35, + 0xda, 0x58, 0x57, 0x48, 0xe1, 0x3d, 0xca, 0xe1, 0x0d, 0x05, 0xee, 0x9c, 0xf8, 0x7e, 0x14, 0xbb, + 0x3c, 0xce, 0xb8, 0x2d, 0x85, 0x7b, 0xc8, 0x63, 0xe1, 0x45, 0xa1, 0x17, 0xb6, 0xc6, 0x28, 0xd8, + 0x60, 0x8a, 0xe5, 0x91, 0x1f, 0x39, 0xc7, 0xc3, 0xae, 0x28, 0x18, 0x34, 0xc5, 0x1d, 0x10, 0x24, + 0x32, 0xec, 0x99, 0x0c, 0x73, 0xa2, 0x4e, 0x37, 0xb6, 0xc3, 0x16, 0x0f, 0x78, 0xd2, 0x8e, 0xdc, + 0x8c, 0x9d, 0xe5, 0x67, 0x49, 0xfa, 0xd3, 0xf8, 0xe7, 0x14, 0x79, 0xaa, 0x8e, 0xdf, 0xb3, 0xc7, + 0x1f, 0x7a, 0x0e, 0xdf, 0x55, 0x15, 0xd0, 0x2f, 0x35, 0x32, 0xeb, 0x22, 0x6e, 0x79, 0xae, 0xae, + 0x55, 0xb4, 0xad, 0xf9, 0xda, 0xe7, 0xda, 0x57, 0x92, 0x4d, 0xfc, 0x5b, 0xb2, 0x37, 0x5a, 0x5e, + 0xd2, 0x3e, 0x39, 0xda, 0x76, 0xa2, 0xe0, 0x8e, 0xe8, 0x86, 0x4e, 0xd2, 0xf6, 0xc2, 0x96, 0xf2, + 0x0b, 0x24, 0x60, 0x10, 0x27, 0xf2, 0xb7, 0x53, 0xef, 0xf7, 0xf6, 0xae, 0x24, 0x9b, 0xc9, 0x7f, + 0xf7, 0x24, 0x9b, 0x71, 0xb3, 0xdf, 0x7d, 0xc9, 0x16, 0xce, 0x02, 0xff, 0x6d, 0xc3, 0x73, 0x5f, + 0xb1, 0x93, 0x24, 0x36, 0x7a, 0x17, 0xd5, 0xe9, 0xec, 0x77, 0xff, 0xa2, 0x5a, 0xd8, 0xfd, 0xf2, + 0xb2, 0xaa, 0x9d, 0x5f, 0x56, 0x0b, 0x1f, 0x66, 0xce, 0xb8, 0xf4, 0x4f, 0x1a, 0x59, 0xf0, 0xc2, + 0x24, 0x8e, 0xdc, 0x13, 0x87, 0xbb, 0xd6, 0x51, 0x57, 0x9f, 0x44, 0xc1, 0x9f, 0xfe, 0x4f, 0x82, + 0x7b, 0x92, 0xcd, 0x0f, 0xbc, 0xd6, 0xba, 0x7d, 0xc9, 0x6e, 0xa5, 0x42, 0x15, 0xb0, 0x90, 0xbc, + 0x32, 0x82, 0x82, 0x60, 0xb3, 0xe4, 0x81, 0x3a, 0x64, 0x95, 0x87, 0x4e, 0xdc, 0xed, 0x40, 0x8e, + 0xad, 0x8e, 0x2d, 0xc4, 0x69, 0x14, 0xbb, 0xfa, 0x54, 0x45, 0xdb, 0x9a, 0xad, 0xed, 0xf4, 0x24, + 0xa3, 0x03, 0xfa, 0x20, 0x63, 0xfb, 0x92, 0xe9, 0x18, 0x76, 0x94, 0x32, 0xcc, 0x31, 0xf6, 0xc6, + 0x79, 0x95, 0xac, 0xa6, 0x0b, 0x5b, 0x5e, 0xd2, 0x06, 0x99, 0xcc, 0x96, 0x72, 0xb6, 0xb6, 0x7b, + 0x25, 0xd9, 0x24, 0x7e, 0xe2, 0xa4, 0x07, 0x11, 0x36, 0x4b, 0x2b, 0x50, 0x09, 0x23, 0x97, 0x37, + 0xed, 0x13, 0x3f, 0x79, 0xdb, 0x48, 0xe2, 0x13, 0xae, 0x2e, 0xc9, 0xf9, 0x65, 0x75, 0xf2, 0xde, + 0xde, 0x17, 0xf0, 0x6d, 0x93, 0x9e, 0x4b, 0x7f, 0x40, 0xae, 0xfb, 0xf6, 0x11, 0xf7, 0x31, 0xe3, + 0xb3, 0xb5, 0x6f, 0xf7, 0x24, 0x4b, 0x81, 0xbe, 0x64, 0x15, 0x74, 0x8a, 0xa3, 0xcc, 0x6f, 0xcc, + 0x45, 0x62, 0xc7, 0xc9, 0xdb, 0x46, 0xd3, 0xf6, 0x05, 0xba, 0x25, 0x03, 0xfa, 0xd3, 0xcb, 0xea, + 0x84, 0x99, 0x4e, 0xa6, 0x2d, 0xb2, 0xd4, 0xf4, 0x7c, 0x2e, 0xba, 0x22, 0xe1, 0x81, 0x05, 0xfb, + 0x1b, 0x93, 0xb4, 0xb8, 0x43, 0xb7, 0x9b, 0x62, 0xbb, 0x5e, 0x50, 0x87, 0xdd, 0x0e, 0xaf, 0xbd, + 0xdc, 0x93, 0x6c, 0xb1, 0x59, 0xc2, 0xfa, 0x92, 0xad, 0x61, 0xf4, 0x32, 0x6c, 0x98, 0x43, 0x76, + 0x74, 0x9f, 0x5c, 0xeb, 0xd8, 0x49, 0x5b, 0xbf, 0x86, 0xf2, 0xdf, 0xea, 0x49, 0x86, 0xe3, 0xbe, + 0x64, 0x4f, 0xe3, 0x7c, 0x18, 0x64, 0xe2, 0x8b, 0x94, 0x7c, 0x02, 0xc2, 0x67, 0x0b, 0xe6, 0xc9, + 0x45, 0x55, 0xfb, 0xc4, 0xc4, 0x69, 0xf4, 0x80, 0x5c, 0x43, 0xb1, 0xd7, 0x33, 0xb1, 0xe9, 0xe9, + 0xdd, 0x4e, 0x97, 0x03, 0xc5, 0x6e, 0x41, 0x88, 0x24, 0x95, 0xb8, 0x84, 0x21, 0x60, 0x50, 0x6c, + 0xa3, 0xd9, 0x62, 0x64, 0xa2, 0x15, 0xfd, 0x09, 0x99, 0x4e, 0xf7, 0xb9, 0xd0, 0x6f, 0x54, 0xa6, + 0xb6, 0xe6, 0x76, 0x9e, 0x2b, 0x3b, 0x1d, 0x73, 0x78, 0x6b, 0x0c, 0xb6, 0x7d, 0x4f, 0xb2, 0x7c, + 0x66, 0x5f, 0xb2, 0x79, 0x0c, 0x95, 0x8e, 0x0d, 0x33, 0x27, 0xe8, 0x6f, 0x34, 0xb2, 0x12, 0x73, + 0xe1, 0xd8, 0xa1, 0xe5, 0x85, 0x09, 0x8f, 0x1f, 0xda, 0xbe, 0x25, 0xf4, 0xe9, 0x8a, 0xb6, 0x75, + 0xbd, 0xd6, 0xea, 0x49, 0xb6, 0x94, 0x92, 0xf7, 0x32, 0xae, 0xd1, 0x97, 0xec, 0x25, 0xf4, 0x34, + 0x84, 0x0f, 0xa7, 0xe8, 0xf5, 0x37, 0xef, 0xde, 0x35, 0x9e, 0x48, 0x36, 0xe5, 0x85, 0x49, 0xef, + 0xa2, 0xba, 0x36, 0xce, 0xfc, 0xc9, 0x45, 0xf5, 0x1a, 0xd8, 0x99, 0xc3, 0x41, 0xe8, 0xdf, 0x35, + 0x42, 0x9b, 0xc2, 0x3a, 0xb5, 0x13, 0xa7, 0xcd, 0x63, 0x8b, 0x87, 0xf6, 0x91, 0xcf, 0x5d, 0x7d, + 0xa6, 0xa2, 0x6d, 0xcd, 0xd4, 0x7e, 0xa5, 0x5d, 0x49, 0xb6, 0x5c, 0x6f, 0x7c, 0x90, 0xb2, 0xef, + 0xa5, 0x64, 0x4f, 0xb2, 0xe5, 0xa6, 0x28, 0x63, 0x7d, 0xc9, 0x5e, 0x4e, 0x37, 0xc1, 0x10, 0x31, + 0xac, 0x36, 0xdf, 0xe3, 0xeb, 0x63, 0x0d, 0x41, 0x27, 0x58, 0x9c, 0x5f, 0x56, 0x47, 0xc2, 0x9a, + 0x23, 0x41, 0xe9, 0xdf, 0xca, 0xe2, 0x5d, 0xee, 0xdb, 0x5d, 0x4b, 0xe8, 0xb3, 0x15, 0x6d, 0x4b, + 0xab, 0x7d, 0x06, 0xe2, 0x97, 0x0a, 0x2f, 0x7b, 0x40, 0x36, 0x20, 0xcf, 0x85, 0x9b, 0x14, 0xea, + 0x4b, 0xf6, 0x62, 0x59, 0x7a, 0x8a, 0x0f, 0x2b, 0x7f, 0xed, 0x2e, 0xe8, 0x5e, 0x1b, 0x67, 0xf5, + 0xe4, 0xa2, 0x3a, 0xf9, 0xda, 0xdd, 0xf3, 0xcb, 0xea, 0x70, 0x38, 0x73, 0x38, 0x18, 0xfd, 0x29, + 0x99, 0xf7, 0x5a, 0x61, 0x14, 0x73, 0xab, 0xc3, 0xe3, 0x40, 0xe8, 0x04, 0x13, 0xfd, 0x4e, 0x4f, + 0xb2, 0xb9, 0x14, 0x3f, 0x00, 0xb8, 0x2f, 0xd9, 0xcd, 0xb4, 0x4c, 0x0c, 0xb0, 0x62, 0xdf, 0x2e, + 0x0f, 0x83, 0xa6, 0x3a, 0x95, 0xfe, 0x5c, 0x23, 0x8b, 0xf6, 0x49, 0x12, 0x59, 0x61, 0x14, 0x07, + 0xb6, 0xef, 0x3d, 0xe2, 0xfa, 0x1c, 0x06, 0xf9, 0xb0, 0x27, 0xd9, 0x02, 0x30, 0xef, 0xe7, 0x44, + 0xf1, 0xe9, 0x25, 0xf4, 0x9b, 0x96, 0x8c, 0x8e, 0x5a, 0xe5, 0xeb, 0x65, 0x96, 0xfd, 0xd2, 0x88, + 0x2c, 0x04, 0x5e, 0x68, 0xb9, 0x9e, 0x38, 0xb6, 0x9a, 0x31, 0xe7, 0xfa, 0x7c, 0x45, 0xdb, 0x9a, + 0xdb, 0x99, 0xcf, 0xcf, 0x53, 0xc3, 0x7b, 0xc4, 0x6b, 0xef, 0x64, 0x47, 0x67, 0x2e, 0xf0, 0xc2, + 0x3d, 0x4f, 0x1c, 0xd7, 0x63, 0x0e, 0x8a, 0x18, 0x2a, 0x52, 0x30, 0x75, 0x0d, 0x2a, 0xb7, 0x8d, + 0x27, 0x17, 0xd5, 0xa9, 0xd7, 0x2a, 0xb7, 0x4d, 0x75, 0x1a, 0x6d, 0x11, 0x32, 0xb8, 0xe0, 0xf5, + 0x05, 0x8c, 0xc6, 0xf2, 0x68, 0x3f, 0x2c, 0x98, 0xf2, 0xd9, 0x7d, 0x21, 0x13, 0xa0, 0x4c, 0xed, + 0x4b, 0xb6, 0x8c, 0xf1, 0x07, 0x90, 0x61, 0x2a, 0x3c, 0x7d, 0x87, 0x4c, 0x3b, 0x51, 0xc7, 0xe3, + 0xb1, 0xd0, 0x17, 0xf1, 0xe8, 0x3e, 0x0f, 0x87, 0x3f, 0x83, 0x8a, 0xfb, 0x35, 0x1b, 0xe7, 0xc7, + 0xd2, 0xcc, 0x0d, 0xe8, 0x3f, 0x34, 0x72, 0x13, 0x5a, 0x0b, 0x1e, 0x5b, 0x81, 0x7d, 0x66, 0x75, + 0x78, 0xe8, 0x7a, 0x61, 0xcb, 0x3a, 0xf6, 0x8e, 0xf4, 0x25, 0x74, 0xf7, 0x5b, 0xd8, 0xb5, 0xab, + 0x07, 0x68, 0xb2, 0x6f, 0x9f, 0x1d, 0xa4, 0x06, 0xf7, 0xbd, 0x5a, 0x4f, 0xb2, 0xd5, 0xce, 0x28, + 0xdc, 0x97, 0xec, 0xa9, 0xb4, 0x7a, 0x8e, 0x72, 0x4a, 0x55, 0x18, 0x3b, 0x75, 0x3c, 0x7c, 0x7e, + 0x59, 0x1d, 0x17, 0xdf, 0x1c, 0x63, 0x7b, 0x04, 0xe9, 0x68, 0xdb, 0xa2, 0x0d, 0xe9, 0x58, 0x1e, + 0xa4, 0x23, 0x83, 0x8a, 0x74, 0x64, 0xe3, 0x41, 0x3a, 0x32, 0x80, 0xbe, 0x4b, 0xae, 0x63, 0x93, + 0xa5, 0xaf, 0x60, 0x11, 0x5f, 0xc9, 0x57, 0x0c, 0xe2, 0x3f, 0x00, 0xa2, 0xa6, 0xc3, 0x2d, 0x87, + 0x36, 0x7d, 0xc9, 0xe6, 0xd0, 0x1b, 0x8e, 0x0c, 0x33, 0x45, 0xe9, 0x7d, 0xb2, 0x90, 0x1d, 0x28, + 0x97, 0xfb, 0x3c, 0xe1, 0x3a, 0xc5, 0xcd, 0xfe, 0x02, 0xb6, 0x14, 0x48, 0xec, 0x21, 0xde, 0x97, + 0x8c, 0x2a, 0x47, 0x2a, 0x05, 0x0d, 0xb3, 0x64, 0x43, 0xcf, 0x88, 0x8e, 0x05, 0xba, 0x13, 0x47, + 0xad, 0x98, 0x0b, 0xa1, 0x56, 0xea, 0x55, 0xfc, 0x3e, 0xb8, 0x75, 0xd7, 0xc1, 0xe6, 0x20, 0x33, + 0x51, 0xeb, 0x75, 0x7a, 0x8f, 0x8d, 0x65, 0x8b, 0x6f, 0x1f, 0x3f, 0x99, 0x36, 0xc8, 0x62, 0xb6, + 0x2f, 0x3a, 0xf6, 0x89, 0xe0, 0x96, 0xd0, 0xd7, 0x30, 0xde, 0xab, 0xf0, 0x1d, 0x29, 0x73, 0x00, + 0x44, 0xa3, 0xf8, 0x0e, 0x15, 0x2c, 0xbc, 0x97, 0x4c, 0x29, 0x27, 0x0b, 0xb0, 0xcb, 0x20, 0xa9, + 0xbe, 0xe7, 0x24, 0x42, 0x5f, 0x47, 0x9f, 0xdf, 0x01, 0x9f, 0x81, 0x7d, 0xb6, 0x9b, 0xe3, 0x83, + 0x53, 0xa7, 0x80, 0xe5, 0xd2, 0x97, 0x05, 0x48, 0x2b, 0x9d, 0x59, 0x9a, 0x4d, 0x5d, 0xb2, 0xe6, + 0x7a, 0x02, 0x4a, 0xb2, 0x25, 0x3a, 0x76, 0x2c, 0xb8, 0x85, 0x37, 0xbf, 0x7e, 0x13, 0x57, 0x02, + 0x7b, 0xad, 0x8c, 0x6f, 0x20, 0x8d, 0x3d, 0x45, 0xd1, 0x6b, 0x8d, 0x52, 0x86, 0x39, 0xc6, 0x5e, + 0x8d, 0x92, 0xf0, 0xa0, 0x63, 0x79, 0xa1, 0xcb, 0xcf, 0xb8, 0xd0, 0x6f, 0x8d, 0x44, 0x39, 0xe4, + 0x41, 0xe7, 0x5e, 0xca, 0x0e, 0x47, 0x51, 0xa8, 0x41, 0x14, 0x05, 0xa4, 0x3b, 0xe4, 0x06, 0x2e, + 0x80, 0xab, 0xeb, 0xe8, 0x77, 0xa3, 0x27, 0x59, 0x86, 0x14, 0x57, 0x7b, 0x3a, 0x34, 0xcc, 0x0c, + 0xa7, 0x09, 0xb9, 0x75, 0xca, 0xed, 0x63, 0x0b, 0x76, 0xb5, 0x95, 0xb4, 0x63, 0x2e, 0xda, 0x91, + 0xef, 0x5a, 0x1d, 0x27, 0xd1, 0x9f, 0xc2, 0x84, 0x43, 0x79, 0x5f, 0x03, 0x93, 0xef, 0xda, 0xa2, + 0x7d, 0x98, 0x1b, 0x1c, 0x38, 0x49, 0x5f, 0xb2, 0x0d, 0x74, 0x39, 0x8e, 0x2c, 0x16, 0x75, 0xec, + 0x54, 0xba, 0x4b, 0xe6, 0x02, 0x3b, 0x3e, 0xe6, 0xb1, 0x15, 0xda, 0x01, 0xd7, 0x37, 0xb0, 0xab, + 0x32, 0xa0, 0x9c, 0xa5, 0xf0, 0xfb, 0x76, 0xc0, 0x8b, 0x72, 0x36, 0x80, 0x0c, 0x53, 0xe1, 0x69, + 0x97, 0x6c, 0xc0, 0xeb, 0xc5, 0x8a, 0x4e, 0x43, 0x1e, 0x8b, 0xb6, 0xd7, 0xb1, 0x9a, 0x71, 0x14, + 0x58, 0x1d, 0x3b, 0xe6, 0x61, 0xa2, 0x3f, 0x8d, 0x29, 0xf8, 0xff, 0x9e, 0x64, 0xb7, 0xc0, 0xea, + 0x41, 0x6e, 0x54, 0x8f, 0xa3, 0xe0, 0x00, 0x4d, 0xfa, 0x92, 0x3d, 0x9b, 0x57, 0xbc, 0x71, 0xbc, + 0x61, 0x7e, 0xd3, 0x4c, 0xfa, 0x0b, 0x8d, 0xac, 0x04, 0x91, 0x6b, 0x25, 0x5e, 0xc0, 0xad, 0x53, + 0x2f, 0x74, 0xa3, 0x53, 0x4b, 0xe8, 0xcf, 0x60, 0xc2, 0x3e, 0xba, 0x92, 0x6c, 0xc5, 0xb4, 0x4f, + 0xf7, 0x23, 0xf7, 0xd0, 0x0b, 0xf8, 0x07, 0xc8, 0xc2, 0xe5, 0xbd, 0x18, 0x94, 0x90, 0xa2, 0xf7, + 0x2c, 0xc3, 0x79, 0xe6, 0xce, 0x2f, 0xab, 0xa3, 0x5e, 0xcc, 0x21, 0x1f, 0xf4, 0x53, 0x8d, 0xac, + 0x67, 0xc7, 0xc4, 0x39, 0x89, 0x41, 0x9b, 0x75, 0x1a, 0x7b, 0x09, 0x17, 0xfa, 0xb3, 0x28, 0xe6, + 0xfb, 0x50, 0x7a, 0xd3, 0x0d, 0x9f, 0xf1, 0x1f, 0x20, 0xdd, 0x97, 0xec, 0xb6, 0x72, 0x6a, 0x4a, + 0x9c, 0x72, 0x78, 0x76, 0x94, 0xb3, 0xa3, 0xed, 0x98, 0xe3, 0x3c, 0x41, 0x11, 0xcb, 0xf7, 0x76, + 0x13, 0x9e, 0x4a, 0xfa, 0xe6, 0xa0, 0x88, 0x65, 0x44, 0x1d, 0xf0, 0xe2, 0xf0, 0xab, 0xa0, 0x61, + 0x96, 0x6c, 0xa8, 0x4f, 0x96, 0xf1, 0x09, 0x6b, 0x41, 0x2d, 0xb0, 0xd2, 0xfa, 0xca, 0xb0, 0xbe, + 0xde, 0xcc, 0xeb, 0x6b, 0x0d, 0xf8, 0x41, 0x91, 0xc5, 0xae, 0xfe, 0xa8, 0x84, 0x15, 0x99, 0x2d, + 0xc3, 0x86, 0x39, 0x64, 0x47, 0x3f, 0xd7, 0xc8, 0x0a, 0x6e, 0x21, 0x7c, 0x01, 0x5b, 0xe9, 0x13, + 0x58, 0xaf, 0x60, 0xbc, 0x55, 0x78, 0x41, 0xec, 0x46, 0x9d, 0xae, 0x09, 0xdc, 0x3e, 0x52, 0xb5, + 0xfb, 0xd0, 0x83, 0x39, 0x65, 0xb0, 0x2f, 0xd9, 0x56, 0xb1, 0x8d, 0x14, 0x5c, 0x49, 0xa3, 0x48, + 0xec, 0xd0, 0xb5, 0x63, 0x17, 0xee, 0xff, 0x99, 0x7c, 0x60, 0x0e, 0x3b, 0xa2, 0x7f, 0x04, 0x39, + 0x36, 0x14, 0x50, 0x1e, 0x0a, 0x2f, 0xf1, 0x1e, 0x42, 0x46, 0xf5, 0xe7, 0x30, 0x9d, 0x67, 0xd0, + 0x10, 0xee, 0xda, 0x82, 0x37, 0x72, 0xae, 0x8e, 0x0d, 0xa1, 0x53, 0x86, 0xfa, 0x92, 0xad, 0xa7, + 0x62, 0xca, 0x38, 0xf4, 0x40, 0x23, 0xb6, 0xa3, 0x10, 0xb4, 0x81, 0x43, 0x41, 0xcc, 0x21, 0x1b, + 0x41, 0xff, 0xa0, 0x91, 0xe5, 0x66, 0xe4, 0xfb, 0xd1, 0xa9, 0xf5, 0xf1, 0x49, 0xe8, 0x40, 0x3b, + 0x22, 0x74, 0x63, 0xa0, 0xf2, 0x7b, 0x39, 0xf8, 0xae, 0xd8, 0xf3, 0x62, 0x01, 0x2a, 0x3f, 0x2e, + 0x43, 0x85, 0xca, 0x21, 0x1c, 0x55, 0x0e, 0xdb, 0x8e, 0x42, 0xa0, 0x72, 0x28, 0x88, 0xb9, 0x94, + 0x2a, 0x2a, 0x60, 0xfa, 0x80, 0x2c, 0xc2, 0x8e, 0x1a, 0x54, 0x07, 0xfd, 0x79, 0x94, 0x08, 0x0f, + 0xab, 0x05, 0x60, 0x8a, 0x73, 0xdd, 0x97, 0x6c, 0x35, 0xbd, 0xfc, 0x54, 0xd4, 0x30, 0xcb, 0x56, + 0xe8, 0x90, 0x87, 0xae, 0xe2, 0xb0, 0xaa, 0x38, 0xe4, 0xa1, 0x3b, 0xc6, 0xa1, 0x8a, 0x82, 0x43, + 0x75, 0x0c, 0x45, 0x10, 0x15, 0x9e, 0x41, 0x37, 0x2a, 0xf4, 0xdb, 0xe8, 0x0d, 0x8b, 0x20, 0xc0, + 0x3f, 0x42, 0xb4, 0x28, 0x82, 0x03, 0xc8, 0x30, 0x15, 0x1e, 0x9d, 0x80, 0xaa, 0xcc, 0xc9, 0x0b, + 0x8a, 0x13, 0x1e, 0xba, 0xc3, 0x4e, 0x0a, 0x08, 0x9c, 0x14, 0x03, 0x68, 0xec, 0x71, 0x3e, 0xdc, + 0x7d, 0x09, 0x8f, 0xf5, 0x17, 0xb1, 0x07, 0x5d, 0xcd, 0x4f, 0x1c, 0x5a, 0xd5, 0x91, 0xaa, 0x6d, + 0xe5, 0x8d, 0xef, 0xd9, 0x00, 0xec, 0x4b, 0xb6, 0x82, 0xfe, 0x15, 0xcc, 0x30, 0x55, 0x0b, 0x7a, + 0x4c, 0x66, 0x63, 0x6e, 0xbb, 0x56, 0x14, 0xfa, 0x5d, 0xfd, 0xcf, 0x75, 0x54, 0xb9, 0x7f, 0x25, + 0x19, 0xdd, 0xe3, 0x9d, 0x98, 0x3b, 0x76, 0xc2, 0x5d, 0x93, 0xdb, 0xee, 0x83, 0xd0, 0xef, 0xf6, + 0x24, 0xd3, 0x5e, 0x2d, 0xfe, 0x44, 0x89, 0x23, 0x6c, 0xd6, 0x5f, 0x89, 0x02, 0x0f, 0x6e, 0xce, + 0xa4, 0x8b, 0x7f, 0xa2, 0x8c, 0xa0, 0xba, 0x66, 0xce, 0xc4, 0x99, 0x03, 0xfa, 0x33, 0xb2, 0x52, + 0xea, 0xe0, 0xf1, 0x36, 0xfb, 0x4b, 0x1d, 0x5f, 0x56, 0xef, 0x5d, 0x49, 0xa6, 0x0f, 0x82, 0xee, + 0x0f, 0xfa, 0xf0, 0x03, 0x27, 0xc9, 0x43, 0x6f, 0x0e, 0xb7, 0xf1, 0x07, 0x4e, 0xa2, 0x28, 0xd0, + 0x35, 0x73, 0xb1, 0x4c, 0xd2, 0x1f, 0x93, 0xe9, 0xb4, 0x7b, 0x11, 0xfa, 0x97, 0x75, 0xac, 0xbc, + 0xdf, 0x82, 0x6b, 0x60, 0x10, 0x28, 0xed, 0x4a, 0x45, 0xf9, 0xe3, 0xb2, 0x29, 0x8a, 0xeb, 0xac, + 0xdc, 0xea, 0x9a, 0x99, 0xfb, 0xa3, 0xc7, 0x64, 0x11, 0xfb, 0xba, 0xc1, 0xbe, 0xfb, 0x6b, 0x9a, + 0xbf, 0xdd, 0x2b, 0xc9, 0x6e, 0x0d, 0x22, 0x34, 0x1c, 0x3b, 0x2c, 0x36, 0x57, 0x1e, 0xe7, 0xd9, + 0xa2, 0xab, 0x2b, 0xa8, 0xf2, 0x87, 0x2c, 0x94, 0x38, 0xe3, 0xb3, 0x29, 0x32, 0xa7, 0x2c, 0x37, + 0xfd, 0x88, 0x4c, 0xf3, 0x30, 0x89, 0x3d, 0x2e, 0x74, 0x0d, 0xff, 0x56, 0xd0, 0xc7, 0x6c, 0x8a, + 0xf7, 0xc2, 0x24, 0xee, 0xd6, 0x5e, 0xcc, 0xff, 0x4d, 0xc8, 0x26, 0x14, 0x3d, 0x2f, 0x8c, 0x71, + 0xd9, 0xae, 0xe3, 0x2f, 0x33, 0x37, 0xa0, 0xbf, 0xcb, 0x2e, 0x2f, 0xe1, 0x85, 0x2d, 0x9f, 0x5b, + 0xc8, 0x5a, 0x02, 0x1e, 0x7d, 0x93, 0x98, 0xc2, 0x26, 0xf4, 0x45, 0x81, 0x7d, 0xd6, 0x40, 0x1e, + 0xa3, 0x34, 0xd4, 0x97, 0xdf, 0x28, 0x55, 0xea, 0xfb, 0x76, 0xde, 0x50, 0x1e, 0x11, 0x63, 0xfc, + 0xc0, 0x03, 0x10, 0xac, 0xcc, 0x31, 0x1c, 0x7d, 0x44, 0x16, 0x41, 0x5a, 0x12, 0x25, 0xd0, 0x40, + 0x83, 0xa6, 0x29, 0xd4, 0x74, 0x98, 0xf5, 0x9f, 0x87, 0x40, 0x64, 0x6a, 0x9e, 0xcb, 0xd5, 0x14, + 0xa0, 0xa2, 0xe3, 0x8d, 0xbb, 0x6f, 0xbd, 0xa9, 0xe8, 0x28, 0xcd, 0x05, 0x05, 0xc0, 0x9b, 0x25, + 0xd4, 0xf8, 0xbd, 0x46, 0x96, 0x87, 0xd3, 0x0b, 0xcf, 0x8d, 0x00, 0x5e, 0xe3, 0xd9, 0x3f, 0x73, + 0xff, 0x07, 0x6f, 0x0b, 0x04, 0x94, 0x3e, 0x29, 0x71, 0xda, 0xc5, 0x4b, 0x9b, 0x0c, 0x86, 0x66, + 0x6a, 0x48, 0xeb, 0xe4, 0x06, 0x3c, 0xdc, 0xbd, 0x04, 0xf3, 0x3b, 0x53, 0xdb, 0xc6, 0xfe, 0x10, + 0x91, 0xe2, 0x08, 0xa7, 0xc3, 0xc2, 0xcb, 0x9c, 0x32, 0x36, 0x33, 0xdb, 0xda, 0xfd, 0xaf, 0xbe, + 0xde, 0x9c, 0xb8, 0xfc, 0x7a, 0x73, 0xe2, 0xab, 0xab, 0x4d, 0xed, 0xf2, 0x6a, 0x53, 0xfb, 0xf5, + 0xe3, 0xcd, 0x89, 0x2f, 0x1e, 0x6f, 0x6a, 0x97, 0x8f, 0x37, 0x27, 0xfe, 0xf5, 0x78, 0x73, 0xe2, + 0xc3, 0x97, 0xfe, 0x8b, 0x3f, 0x52, 0xd3, 0x7d, 0x74, 0x74, 0x03, 0xff, 0x50, 0x7d, 0xfd, 0x3f, + 0x01, 0x00, 0x00, 0xff, 0xff, 0xe3, 0x79, 0xd7, 0x43, 0x6e, 0x17, 0x00, 0x00, } func (m *FolderDeviceConfiguration) Marshal() (dAtA []byte, err error) { @@ -797,9 +797,10 @@ func (m *FolderConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x50 } if m.FSWatcherDelayS != 0 { - i = encodeVarintFolderconfiguration(dAtA, i, uint64(m.FSWatcherDelayS)) + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.FSWatcherDelayS)))) i-- - dAtA[i] = 0x48 + dAtA[i] = 0x49 } if m.FSWatcherEnabled { i-- @@ -1016,7 +1017,7 @@ func (m *FolderConfiguration) ProtoSize() (n int) { n += 2 } if m.FSWatcherDelayS != 0 { - n += 1 + sovFolderconfiguration(uint64(m.FSWatcherDelayS)) + n += 9 } if m.IgnorePerms { n += 2 @@ -1549,24 +1550,16 @@ func (m *FolderConfiguration) Unmarshal(dAtA []byte) error { } m.FSWatcherEnabled = bool(v != 0) case 9: - if wireType != 0 { + if wireType != 1 { return fmt.Errorf("proto: wrong wireType = %d for field FSWatcherDelayS", wireType) } - m.FSWatcherDelayS = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.FSWatcherDelayS |= int(b&0x7F) << shift - if b < 0x80 { - break - } + var v uint64 + if (iNdEx + 8) > l { + return io.ErrUnexpectedEOF } + v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) + iNdEx += 8 + m.FSWatcherDelayS = float64(math.Float64frombits(v)) case 10: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field IgnorePerms", wireType) diff --git a/lib/ur/usage_report.go b/lib/ur/usage_report.go index cd7fb89d88..4e0671e640 100644 --- a/lib/ur/usage_report.go +++ b/lib/ur/usage_report.go @@ -254,7 +254,7 @@ func (s *Service) reportData(ctx context.Context, urVersion int, preview bool) ( } report.FolderUsesV3.PullOrder[cfg.Order.String()]++ report.FolderUsesV3.FilesystemType[cfg.FilesystemType.String()]++ - report.FolderUsesV3.FsWatcherDelays = append(report.FolderUsesV3.FsWatcherDelays, cfg.FSWatcherDelayS) + report.FolderUsesV3.FsWatcherDelays = append(report.FolderUsesV3.FsWatcherDelays, int(cfg.FSWatcherDelayS)) if cfg.MarkerName != config.DefaultMarkerName { report.FolderUsesV3.CustomMarkerName++ } @@ -310,7 +310,6 @@ func (s *Service) reportData(ctx context.Context, urVersion int, preview bool) ( if err == nil { if addr.IP.IsLoopback() { report.GUIStats.ListenLocal++ - } else if addr.IP.IsUnspecified() { report.GUIStats.ListenUnspecified++ } diff --git a/lib/watchaggregator/aggregator.go b/lib/watchaggregator/aggregator.go index c4567226fb..27c2c0a455 100644 --- a/lib/watchaggregator/aggregator.go +++ b/lib/watchaggregator/aggregator.go @@ -456,10 +456,12 @@ func updateInProgressSet(event events.Event, inProgress map[string]struct{}) { // air, they were just considered as a sensible compromise between fast updates and // saving resources. For short delays the timeout is 6 times the delay, capped at 1 // minute. For delays longer than 1 minute, the delay and timeout are equal. -func notifyTimeout(eventDelayS int) time.Duration { - shortDelayS := 10 - shortDelayMultiplicator := 6 - longDelayS := 60 +func notifyTimeout(eventDelayS float64) time.Duration { + const ( + shortDelayS = 10 + shortDelayMultiplicator = 6 + longDelayS = 60 + ) longDelayTimeout := time.Duration(1) * time.Minute if eventDelayS < shortDelayS { return time.Duration(eventDelayS*shortDelayMultiplicator) * time.Second diff --git a/proto/lib/config/folderconfiguration.proto b/proto/lib/config/folderconfiguration.proto index 63326a31e9..285496a2ed 100644 --- a/proto/lib/config/folderconfiguration.proto +++ b/proto/lib/config/folderconfiguration.proto @@ -28,7 +28,7 @@ message FolderConfiguration { repeated FolderDeviceConfiguration devices = 6; int32 rescan_interval_s = 7 [(ext.xml) = "rescanIntervalS,attr", (ext.default) = "3600"]; bool fs_watcher_enabled = 8 [(ext.goname) = "FSWatcherEnabled", (ext.xml) = "fsWatcherEnabled,attr", (ext.default) = "true"]; - int32 fs_watcher_delay_s = 9 [(ext.goname) = "FSWatcherDelayS", (ext.xml) = "fsWatcherDelayS,attr", (ext.default) = "10"]; + double fs_watcher_delay_s = 9 [(ext.goname) = "FSWatcherDelayS", (ext.xml) = "fsWatcherDelayS,attr", (ext.default) = "10"]; bool ignore_perms = 10 [(ext.xml) = "ignorePerms,attr"]; bool auto_normalize = 11 [(ext.xml) = "autoNormalize,attr", (ext.default) = "true"]; Size min_disk_free = 12 [(ext.default) = "1 %"]; |