CEF/grumble
1
0
Fork 0
forked from External/grumble
Code Pull requests Activity

Mimic Murmur's client log prefix.

Browse source
This commit is contained in:
Mikkel Krautz 2011-04-30 22:25:57 +02:00
parent aad95834a2
commit 074b43d3a3
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
server.go
View file

@ -110,9 +110,9 @@ type clientLogForwarder struct {
func (lf clientLogForwarder) Write(incoming []byte) (int, os.Error) { func (lf clientLogForwarder) Write(incoming []byte) (int, os.Error) {
buf := bytes.NewBuffer(nil) buf := bytes.NewBuffer(nil)
if (lf.client.Session == 0) { if (lf.client.Session == 0) {
buf.WriteString("{?} ") buf.WriteString("<?:(-1)> ")
} else { } else {
buf.WriteString(fmt.Sprintf("{%v} ", lf.client.Session)) buf.WriteString(fmt.Sprintf("<%v>:%v(%v)> ", lf.client.Session, lf.client.ShownName(), lf.client.UserId()))
} }
buf.Write(incoming) buf.Write(incoming)
lf.logger.Output(3, buf.String()) lf.logger.Output(3, buf.String())
@ -1168,16 +1168,18 @@ func (s *Server) ListenAndMurmur() {
// New client connected // New client connected
conn, err := listener.Accept() conn, err := listener.Accept()
if err != nil { if err != nil {
s.Printf("Unable to accept() new client.") s.Printf("Unable to accept new client: %v", err)
continue
} }
s.Printf("New connection: %v", conn.RemoteAddr())
// Create a new client connection from our *tls.Conn // Create a new client connection from our *tls.Conn
// which wraps net.TCPConn. // which wraps net.TCPConn.
err = s.NewClient(conn) err = s.NewClient(conn)
if err != nil { if err != nil {
s.Printf("Unable to start new client") s.Printf("Unable to handle new client: %v", err)
continue
} }
s.Printf("num clients = %v", len(s.clients))
} }
} }