[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  342921eb Merge pull request #5 from benrubson/daemonstats
       via  c9066196 Log data sent/received even if error
      from  df0ed76a Add stub for canonical_checksum().

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 342921eb974435f28c9a95d1fbba9fcc345b8447
Merge: df0ed76a c9066196
Author: Wayne Davison <wayne at opencoder.net>
Date:   Thu May 28 13:42:47 2020 -0700

    Merge pull request #5 from benrubson/daemonstats
    
    Have daemon log data sent/received even when exiting with an error.

commit c9066196202f9eb0a61b24296f2246c8a3c15899
Author: benrubson <6764151+benrubson at users.noreply.github.com>
Date:   Tue May 26 19:53:25 2020 +0200

    Log data sent/received even if error

-----------------------------------------------------------------------

Summary of changes:
 log.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/log.c b/log.c
index c2e7fde8..65386754 100644
--- a/log.c
+++ b/log.c
@@ -873,12 +873,11 @@ void log_delete(const char *fname, int mode)
  */
 void log_exit(int code, const char *file, int line)
 {
-	if (code == 0) {
-		rprintf(FLOG,"sent %s bytes  received %s bytes  total size %s\n",
-			big_num(stats.total_written),
-			big_num(stats.total_read),
-			big_num(stats.total_size));
-	} else if (am_server != 2) {
+	rprintf(FLOG,"sent %s bytes  received %s bytes  total size %s\n",
+		big_num(stats.total_written),
+		big_num(stats.total_read),
+		big_num(stats.total_size));
+	if (code != 0 && am_server != 2) {
 		const char *name;
 
 		name = rerr_name(code);


-- 
The rsync repository.