small cleanup

This commit is contained in:
boyska 2018-08-22 20:56:43 +02:00
parent 3132a18164
commit 432d46d15f

46
main.go
View file

@ -20,28 +20,7 @@ func syslogdHandler(channel syslog.LogPartsChannel) {
} }
} }
func main() { func httpHandler(w http.ResponseWriter, r *http.Request) {
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")
flag.Parse()
channel := make(syslog.LogPartsChannel)
handler := syslog.NewChannelHandler(channel)
server := syslog.NewServer()
server.SetFormat(syslog.RFC5424)
server.SetHandler(handler)
if *syslogSocketPath != "" {
server.ListenUnixgram(*syslogSocketPath)
}
server.ListenUDP("127.0.0.1:9514")
circbuf = ring.New(*bufsize)
server.Boot()
go syslogdHandler(channel)
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
circbuf.Do(func(x interface{}) { circbuf.Do(func(x interface{}) {
if x == nil { if x == nil {
return return
@ -54,8 +33,29 @@ func main() {
w.Write([]byte(c)) w.Write([]byte(c))
w.Write([]byte("\n")) w.Write([]byte("\n"))
}) })
}) }
func main() {
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")
flag.Parse()
channel := make(chan format.LogParts)
handler := syslog.NewChannelHandler(channel)
server := syslog.NewServer()
server.SetFormat(syslog.RFC5424)
server.SetHandler(handler)
if *syslogSocketPath != "" {
server.ListenUnixgram(*syslogSocketPath)
} else {
server.ListenUDP("127.0.0.1:9514")
}
circbuf = ring.New(*bufsize)
server.Boot()
go syslogdHandler(channel)
http.HandleFunc("/", httpHandler)
http.ListenAndServe(":9080", nil) http.ListenAndServe(":9080", nil)
server.Wait() server.Wait()