Forbid any later GNU GPL versions autousage

[nncp.git] / src / cypherpunks.ru / nncp / log.go

diff --git a/src/cypherpunks.ru/nncp/log.go b/src/cypherpunks.ru/nncp/log.go
index 0ae0f327d0655d74a67e8868cadbfccaffe95140..05093c5aa2660ea6d0812ff67c403b567eca5c75 100644 (file)
--- a/src/cypherpunks.ru/nncp/log.go
+++ b/src/cypherpunks.ru/nncp/log.go
@@ -1,11 +1,10 @@
 /*
-NNCP -- Node-to-Node CoPy
-Copyright (C) 2016-2017 Sergey Matveev <stargrave@stargrave.org>
+NNCP -- Node to Node copy, utilities for store-and-forward data exchange
+Copyright (C) 2016-2019 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, version 3 of the License.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -98,16 +97,23 @@ func (ctx *Ctx) LogD(who string, sds SDS, msg string) {
 
 func (ctx *Ctx) LogI(who string, sds SDS, msg string) {
        msg = msgFmt(LogLevel("I"), who, sds, msg)
-       fmt.Fprintln(os.Stderr, ctx.Humanize(msg))
+       if !ctx.Quiet {
+               fmt.Fprintln(os.Stderr, ctx.Humanize(msg))
+       }
        ctx.Log(msg)
 }
 
 func (ctx *Ctx) LogP(who string, sds SDS, msg string) {
-       fmt.Fprintln(os.Stderr, ctx.Humanize(msgFmt(LogLevel("P"), who, sds, msg)))
+       if !ctx.Quiet {
+               fmt.Fprintln(os.Stderr, ctx.Humanize(msgFmt(LogLevel("P"), who, sds, msg)))
+       }
 }
 
 func (ctx *Ctx) LogE(who string, sds SDS, msg string) {
        msg = msgFmt(LogLevel("E"), who, sds, msg)
+       if len(msg) > 2048 {
+               msg = msg[:2048]
+       }
        fmt.Fprintln(os.Stderr, ctx.Humanize(msg))
        ctx.Log(msg)
 }