|
@@ -31,9 +31,10 @@ func removeAtExit(socket string) {
|
|
|
|
|
|
func main() {
|
|
|
var err error
|
|
|
+ var syslogSocket SyslogSocket
|
|
|
var logFmt formatter.SyslogRFC
|
|
|
logFmt.Format = syslog.Automatic
|
|
|
- syslogSocketPath := flag.String("syslogd-socket", "", "The socket to listen to syslog addresses")
|
|
|
+ flag.Var(&syslogSocket, "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")
|
|
|
syslogAddr := flag.String("syslog-addr", "127.0.0.1:9514", "Address:port where to listen for syslog messages")
|
|
@@ -56,18 +57,24 @@ func main() {
|
|
|
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 {
|
|
|
- fmt.Fprintln(os.Stderr, "argh", err)
|
|
|
- os.Exit(1)
|
|
|
- }
|
|
|
- defer cleanSocket(*syslogSocketPath)
|
|
|
- fmt.Printf("Binding socket `%s` [syslog]\n", *syslogSocketPath)
|
|
|
+ if syslogSocket.isSocketActivated {
|
|
|
+ fmt.Printf("Binding to socket `%s` [syslog]\n", syslogSocket.String())
|
|
|
+ server.Listen(syslogSocket.Listener)
|
|
|
} else {
|
|
|
- fmt.Printf("Binding address `%s` [syslog]\n", *syslogAddr)
|
|
|
- if err = server.ListenUDP(*syslogAddr); err != nil {
|
|
|
- fmt.Fprintln(os.Stderr, "argh", err)
|
|
|
- os.Exit(1)
|
|
|
+ syslogSocketPath := syslogSocket.Path
|
|
|
+ if syslogSocketPath != "" {
|
|
|
+ if err = server.ListenUnixgram(syslogSocketPath); err != nil {
|
|
|
+ fmt.Fprintln(os.Stderr, "argh", err)
|
|
|
+ os.Exit(1)
|
|
|
+ }
|
|
|
+ fmt.Printf("Binding socket `%s` [syslog]\n", syslogSocketPath)
|
|
|
+ removeAtExit(syslogSocketPath)
|
|
|
+ } else {
|
|
|
+ fmt.Printf("Binding address `%s` [syslog]\n", *syslogAddr)
|
|
|
+ if err = server.ListenUDP(*syslogAddr); err != nil {
|
|
|
+ fmt.Fprintln(os.Stderr, "argh", err)
|
|
|
+ os.Exit(1)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if err = server.Boot(); err != nil {
|