special logging fields: from now on only 'job', 'task', 'subsystem'

This commit is contained in:
Christian Schwarz
2018-08-25 22:15:37 +02:00
parent e30ae972f4
commit 861e5f8313
5 changed files with 13 additions and 30 deletions
+2 -2
View File
@@ -41,7 +41,7 @@ func (p *Pruner) filterFilesystems() (filesystems []*zfs.DatasetPath, stop bool)
func (p *Pruner) filterVersions(fs *zfs.DatasetPath) (fsversions []zfs.FilesystemVersion, stop bool) {
p.task.Enter("filter_versions")
defer p.task.Finish()
log := p.task.Log().WithField(logFSField, fs.ToString())
log := p.task.Log().WithField("fs", fs.ToString())
filter := NewPrefixFilter(p.SnapshotPrefix)
fsversions, err := zfs.ZFSListFilesystemVersions(fs, filter)
@@ -59,7 +59,7 @@ func (p *Pruner) filterVersions(fs *zfs.DatasetPath) (fsversions []zfs.Filesyste
func (p *Pruner) pruneFilesystem(fs *zfs.DatasetPath) (r PruneResult, valid bool) {
p.task.Enter("prune_fs")
defer p.task.Finish()
log := p.task.Log().WithField(logFSField, fs.ToString())
log := p.task.Log().WithField("fs", fs.ToString())
fsversions, stop := p.filterVersions(fs)
if stop {