Mirrors/go-chasquid-smtp
1
0
Fork 0
mirror of https://blitiri.com.ar/repos/chasquid synced 2025-12-20 15:07:03 +00:00
Code Releases Activity

trace: Quote errors before logging them

Browse Source 
Errors can contain newlines, in particular this is common in messages
returned by remote SMTP servers.

This patch quotes them before logging, they don't interfere with the
log. Note the tracer itself can handle this just fine.
This commit is contained in:
Alberto Bertogli
2016-10-13 00:14:09 +01:00
parent 09d3c73f6c
commit a5e6e197a6
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
internal/trace/trace.go
View File

@@ -45,11 +45,6 @@ func (t *Trace) Debugf(format string, a ...interface{}) {
}
}
func quote(s string) string {
qs := strconv.Quote(s)
return qs[1 : len(qs)-1]
}
func (t *Trace) SetError() {
t.t.SetError()
}
@@ -60,7 +55,8 @@ func (t *Trace) Errorf(format string, a ...interface{}) error {
t.t.LazyPrintf("error: %v", err)
if glog.V(0) {
msg := fmt.Sprintf("%s %s: error: %v", t.family, t.title, err)
msg := fmt.Sprintf("%s %s: error: %s", t.family, t.title,
quote(err.Error()))
glog.InfoDepth(1, msg)
}
return err
@@ -71,7 +67,8 @@ func (t *Trace) Error(err error) error {
t.t.LazyPrintf("error: %v", err)
if glog.V(0) {
msg := fmt.Sprintf("%s %s: error: %v", t, t.family, t.title, err)
msg := fmt.Sprintf("%s %s: error: %v", t.family, t.title,
quote(err.Error()))
glog.InfoDepth(1, msg)
}
return err
@@ -116,8 +113,14 @@ func (e *EventLog) Errorf(format string, a ...interface{}) error {
e.e.Errorf("error: %v", err)
if glog.V(0) {
msg := fmt.Sprintf("%s %s: error: %v", e.family, e.title, err)
msg := fmt.Sprintf("%s %s: error: %s", e.family, e.title,
quote(err.Error()))
glog.InfoDepth(1, msg)
}
return err
}
func quote(s string) string {
qs := strconv.Quote(s)
return qs[1 : len(qs)-1]
}