|
@@ -177,7 +177,7 @@ func (server *Server) checkBans(ipaddr net.IP) (banned bool, message string) {
|
177
|
177
|
// check DLINEs
|
178
|
178
|
isBanned, info := server.dlines.CheckIP(ipaddr)
|
179
|
179
|
if isBanned {
|
180
|
|
- server.logger.Info("localconnect-ip", fmt.Sprintf("Client from %v rejected by d-line", ipaddr))
|
|
180
|
+ server.logger.Info("connect-ip", fmt.Sprintf("Client from %v rejected by d-line", ipaddr))
|
181
|
181
|
return true, info.BanMessage("You are banned from this server (%s)")
|
182
|
182
|
}
|
183
|
183
|
|
|
@@ -185,7 +185,7 @@ func (server *Server) checkBans(ipaddr net.IP) (banned bool, message string) {
|
185
|
185
|
err := server.connectionLimiter.AddClient(ipaddr)
|
186
|
186
|
if err == connection_limits.ErrLimitExceeded {
|
187
|
187
|
// too many connections from one client, tell the client and close the connection
|
188
|
|
- server.logger.Info("localconnect-ip", fmt.Sprintf("Client from %v rejected for connection limit", ipaddr))
|
|
188
|
+ server.logger.Info("connect-ip", fmt.Sprintf("Client from %v rejected for connection limit", ipaddr))
|
189
|
189
|
return true, "Too many clients from your network"
|
190
|
190
|
} else if err == connection_limits.ErrThrottleExceeded {
|
191
|
191
|
duration := server.Config().Server.IPLimits.BanDuration
|
|
@@ -199,7 +199,7 @@ func (server *Server) checkBans(ipaddr net.IP) (banned bool, message string) {
|
199
|
199
|
|
200
|
200
|
// this might not show up properly on some clients, but our objective here is just to close it out before it has a load impact on us
|
201
|
201
|
server.logger.Info(
|
202
|
|
- "localconnect-ip",
|
|
202
|
+ "connect-ip",
|
203
|
203
|
fmt.Sprintf("Client from %v exceeded connection throttle, d-lining for %v", ipaddr, duration))
|
204
|
204
|
return true, throttleMessage
|
205
|
205
|
} else if err != nil {
|
|
@@ -380,7 +380,7 @@ func (server *Server) playRegistrationBurst(session *Session) {
|
380
|
380
|
c := session.client
|
381
|
381
|
// continue registration
|
382
|
382
|
d := c.Details()
|
383
|
|
- server.logger.Info("localconnect", fmt.Sprintf("Client connected [%s] [u:%s] [r:%s]", d.nick, d.username, d.realname))
|
|
383
|
+ server.logger.Info("connect", fmt.Sprintf("Client connected [%s] [u:%s] [r:%s]", d.nick, d.username, d.realname))
|
384
|
384
|
server.snomasks.Send(sno.LocalConnects, fmt.Sprintf("Client connected [%s] [u:%s] [h:%s] [ip:%s] [r:%s]", d.nick, d.username, session.rawHostname, session.IP().String(), d.realname))
|
385
|
385
|
|
386
|
386
|
// send welcome text
|