|
@@ -12,6 +12,7 @@ import (
|
|
|
"time"
|
|
|
|
|
|
"git.lattuga.net/boyska/circolog"
|
|
|
+ "git.lattuga.net/boyska/circolog/formatter"
|
|
|
"github.com/coreos/go-systemd/daemon"
|
|
|
syslog "gopkg.in/mcuadros/go-syslog.v2"
|
|
|
)
|
|
@@ -24,6 +25,8 @@ func cleanSocket(socket string) {
|
|
|
|
|
|
func main() {
|
|
|
var err error
|
|
|
+ var logFmt formatter.SyslogRFC
|
|
|
+ logFmt.Format = syslog.Automatic
|
|
|
syslogSocketPath := flag.String("syslogd-socket", "", "The socket to listen to syslog addresses")
|
|
|
// dumpSocketPath := flag.String("dump-socket", "/run/buffer.sock", "The socket that user will connect to in order to receive logs")
|
|
|
bufsize := flag.Int("buffer-size", 1000, "Number of messages to keep")
|
|
@@ -31,6 +34,7 @@ func main() {
|
|
|
queryAddr := flag.String("query-addr", "127.0.0.1:9080", "Address:port where to bind the query service")
|
|
|
querySocket := flag.String("query-socket", "", "Path to a unix domain socket for the HTTP server; recommended for security reasons!")
|
|
|
ctlSocket := flag.String("ctl-socket", "/tmp/circologd-ctl.sock", "Path to a unix domain socket for the control server; leave empty to disable")
|
|
|
+ flag.Var(&logFmt, "log-fmt", "Log messages format. If not set, defaults to automatic choice. Allowed values: rfc3164, rfc5424, auto.")
|
|
|
verbose := flag.Bool("verbose", false, "Print more output executing the daemon")
|
|
|
debug := flag.Bool("debug", false, "Print debugging info executing the daemon")
|
|
|
flag.Parse()
|
|
@@ -43,7 +47,8 @@ func main() {
|
|
|
go hub.Run()
|
|
|
|
|
|
server := syslog.NewServer()
|
|
|
- server.SetFormat(syslog.Automatic)
|
|
|
+ server.SetFormat(logFmt.Format)
|
|
|
+ fmt.Printf("Syslog format set to: %s\n", logFmt.String())
|
|
|
server.SetHandler(handler)
|
|
|
if *syslogSocketPath != "" {
|
|
|
if err = server.ListenUnixgram(*syslogSocketPath); err != nil {
|