mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-04 21:47:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

log: Correctly handle 'log off' + add missing \n

Browse source
This commit is contained in:
fox.cpp 2019-04-07 00:28:50 +03:00 • committed by Simon Ser
parent 2ae192e12d
commit 741c997fdb
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -87,7 +87,8 @@ These can be specified only outside of any configuration block.
* `syslog` * `syslog`
Send logs to the local syslog daemon. Send logs to the local syslog daemon.
* `off` * `off`
Do nothing. Useful to disable logging fully: `log off` Do nothing. Used to disable logging fully: `log off`
Can't be combined with other targets.
* file path * file path
Write (append) logs to file.. Write (append) logs to file..

5
config.go
View file

@ -142,7 +142,10 @@ func logOutput(m *config.Map, node *config.Node) (interface{}, error) {
} }
outs = append(outs, syslogOut) outs = append(outs, syslogOut)
case "off": case "off":
outs = append(outs, nil) if len(node.Args) != 1 {
return nil, errors.New("'off' can't be combined with other log targets")
}
return nil, nil
default: default:
w, err := os.OpenFile(arg, os.O_RDWR, os.ModePerm) w, err := os.OpenFile(arg, os.O_RDWR, os.ModePerm)
if err != nil { if err != nil {

2
log/log.go
View file

@ -105,7 +105,7 @@ func Syslog() (FuncLog, error) {
} }
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "!!! Failed to send message to syslog daemon: %v", err) fmt.Fprintf(os.Stderr, "!!! Failed to send message to syslog daemon: %v\n", err)
} }
}, nil }, nil
} }