From: Sergey Matveev <stargrave@stargrave.org>
Date: Fri, 28 Apr 2017 13:13:34 +0000 (+0300)
Subject: Visible message about bad chunk's checksum
X-Git-Tag: 0.7^2~33
X-Git-Url: http://www.git.cypherpunks.ru/?a=commitdiff_plain;h=c87ba6cc4d15266a13d1193eb800c8cb6c5cfa75;p=nncp.git

Visible message about bad chunk's checksum
---

diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-reass/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-reass/main.go
index 10024e5..1bb6009 100644
--- a/src/cypherpunks.ru/nncp/cmd/nncp-reass/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-reass/main.go
@@ -154,8 +154,7 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
 			ctx.LogE("nncp-reass", nncp.SDS{
 				"path":  path,
 				"chunk": strconv.Itoa(chunkNum),
-				"err":   "checksum is bad",
-			}, "")
+			}, "checksum is bad")
 			allChecksumsGood = false
 		}
 	}
diff --git a/src/cypherpunks.ru/nncp/humanizer.go b/src/cypherpunks.ru/nncp/humanizer.go
index 546b71f..49b715a 100644
--- a/src/cypherpunks.ru/nncp/humanizer.go
+++ b/src/cypherpunks.ru/nncp/humanizer.go
@@ -234,6 +234,9 @@ func (ctx *Ctx) Humanize(s string) string {
 				rem,
 			)
 		}
+		if err, exists := sds["err"]; exists {
+			msg += ": " + err
+		}
 	default:
 		return s
 	}