From 88aa8c1fea6eb4205b9acaa15efaeccf46c0b309 Mon Sep 17 00:00:00 2001 From: Axel Burri Date: Mon, 28 Aug 2017 17:55:27 +0200 Subject: [PATCH] btrbk: remove "duration" column from transaction_log/transaction_syslog The "duration" column in the transaction log has proven to be confusing to some users, especially on errors (e.g. "send-receive ERROR 27" in issue #177). As it's not really necessary (duration can be computed from the corresponding "starting" log entry), it's now being dropped. --- ChangeLog | 1 + btrbk | 10 +++++----- doc/btrbk.conf.5 | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index b168b14..3b678bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ btrbk-current line option (which is now deprecated). * Add "snapshot" command (close #150). * Add "--preserve-snapshots" and "--preserve-backups" options. + * Remove "duration" column from transaction_log/transaction_syslog. * Bugfix: ssh_filter_btrbk: accept mbuffer command (stream_buffer). * Bugfix: print correct (end-)time in transaction_log. diff --git a/btrbk b/btrbk index ba55515..8f00f71 100755 --- a/btrbk +++ b/btrbk @@ -200,11 +200,11 @@ my %table_formats = ( RALIGN => { size=>1, used=>1, device_size=>1, device_allocated=>1, device_unallocated=>1, device_missing=>1, device_used=>1, free=>1, free_min=>1, data_ratio=>1, metadata_ratio=>1, global_reserve=>1, global_reserve_used=>1 }, }, - transaction => { table => [ qw( type status target_host target_subvol source_host source_subvol parent_subvol ) ], - long => [ qw( localtime type status duration target_host target_subvol source_host source_subvol parent_subvol message ) ], - raw => [ qw( time localtime type status duration target_url source_url parent_url message ) ], - tlog => [ qw( localtime type status duration target_url source_url parent_url message ) ], - syslog => [ qw( type status duration target_url source_url parent_url message ) ], + transaction => { table => [ qw( type status target_host target_subvol source_host source_subvol parent_subvol ) ], + long => [ qw( localtime type status duration target_host target_subvol source_host source_subvol parent_subvol message ) ], + tlog => [ qw( localtime type status target_url source_url parent_url message ) ], + syslog => [ qw( type status target_url source_url parent_url message ) ], + raw => [ qw( time localtime type status duration target_url source_url parent_url message ) ], }, origin_tree => { table => [ qw( tree uuid parent_uuid received_uuid ) ], diff --git a/doc/btrbk.conf.5 b/doc/btrbk.conf.5 index b6ba358..a1e22a8 100644 --- a/doc/btrbk.conf.5 +++ b/doc/btrbk.conf.5 @@ -76,8 +76,8 @@ allowed. .RS 4 If set, all transactions (snapshot create, subvolume send\-receive, subvolume delete) as well as abort messages are logged to , in a -space-separated table format: "localtime type status duration -target_url source_url parent_url message". +space-separated table format: "localtime type status target_url +source_url parent_url message". .RE .PP \fBtransaction_syslog\fR |no