switch sds["type"] {
case "file":
msg = fmt.Sprintf(
- "File %s (%s) transfer to %s:%s (nice %s): %s",
- sds["src"], size, nodeS, sds["dst"], sds["nice"], rem,
+ "File %s (%s) transfer to %s:%s: %s",
+ sds["src"], size, nodeS, sds["dst"], rem,
)
case "freq":
msg = fmt.Sprintf(
- "File request from %s:%s to %s (nice %s): %s",
- nodeS, sds["src"], sds["dst"], sds["nice"], rem,
+ "File request from %s:%s to %s: %s",
+ nodeS, sds["src"], sds["dst"], rem,
)
case "mail":
msg = fmt.Sprintf(
- "Mail to %s@%s (%s) (nice %s): %s",
- nodeS, strings.Replace(sds["dst"], " ", ",", -1), size, sds["nice"], rem,
+ "Mail to %s@%s (%s): %s",
+ nodeS, strings.Replace(sds["dst"], " ", ",", -1), size, rem,
)
case "trns":
msg = fmt.Sprintf(
msg += ": " + err
}
case "check":
- msg = fmt.Sprintf(
- "Integrity check: %s/%s/%s %s",
- sds["node"], sds["xx"], sds["pkt"], sds["err"],
- )
+ msg = fmt.Sprintf("Checking: %s/%s/%s", sds["node"], sds["xx"], sds["pkt"])
+ if err, exists := sds["err"]; exists {
+ msg += fmt.Sprintf(" %s", err)
+ }
case "nncp-xfer":
switch sds["xx"] {
case "rx":
if err, exists := sds["err"]; exists {
msg += ": " + err
}
- case "daemon":
- msg = fmt.Sprintf("Daemon listening on %s", sds["bind"])
case "call-start":
msg = fmt.Sprintf("Connected to %s", nodeS)
case "call-finish":
humanize.IBytes(uint64(rx)), humanize.IBytes(uint64(rxs)),
humanize.IBytes(uint64(tx)), humanize.IBytes(uint64(txs)),
)
- case "llp-infos":
+ case "sp-infos":
switch sds["xx"] {
case "rx":
msg = fmt.Sprintf("%s has got for us: ", nodeS)
return s
}
msg += fmt.Sprintf("%s packets, %s", sds["pkts"], size)
- case "llp-file":
+ case "sp-file":
switch sds["xx"] {
case "rx":
- msg = "Got file "
+ msg = "Got packet "
case "tx":
- msg = "Sent file "
+ msg = "Sent packet "
default:
return s
}
humanize.IBytes(uint64(sizeParsed)),
humanize.IBytes(uint64(fullsize)),
)
- case "llp-done":
+ case "sp-done":
switch sds["xx"] {
case "rx":
- msg = fmt.Sprintf("File %s is retreived (%s)", sds["hash"], size)
+ msg = fmt.Sprintf("Packet %s is retreived (%s)", sds["hash"], size)
case "tx":
- msg = fmt.Sprintf("File %s is sent", sds["hash"])
+ msg = fmt.Sprintf("Packet %s is sent", sds["hash"])
default:
return s
}
+ case "nncp-reass":
+ chunkNum, exists := sds["chunk"]
+ if exists {
+ msg = fmt.Sprintf(
+ "Reassembling chunked file \"%s\" (chunk %s): %s",
+ sds["path"],
+ chunkNum,
+ rem,
+ )
+ } else {
+ msg = fmt.Sprintf(
+ "Reassembling chunked file \"%s\": %s",
+ sds["path"],
+ rem,
+ )
+ }
+ if err, exists := sds["err"]; exists {
+ msg += ": " + err
+ }
default:
return s
}