From: Hendrik B. <nh...@us...> - 2010-07-30 16:53:42
|
Update of /cvsroot/arianne/marauroa/src/marauroa/server/net/nio In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv26381/src/marauroa/server/net/nio Modified Files: NIONetworkServerManager.java Log Message: add message dump to error message on failed message parsing (fixes #3037205) Index: NIONetworkServerManager.java =================================================================== RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/net/nio/NIONetworkServerManager.java,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** NIONetworkServerManager.java 22 Jun 2010 18:17:01 -0000 1.44 --- NIONetworkServerManager.java 30 Jul 2010 16:53:35 -0000 1.45 *************** *** 21,24 **** --- 21,25 ---- import marauroa.common.Log4J; + import marauroa.common.Utility; import marauroa.common.net.Decoder; import marauroa.common.net.Encoder; *************** *** 329,333 **** } } catch (InvalidVersionException e) { ! logger.warn("Invalid version message", e); logger.warn("sender was: " + event.channel.socket().getRemoteSocketAddress()); stats.add("Message invalid version", 1); --- 330,334 ---- } } catch (InvalidVersionException e) { ! logger.warn("Invalid version message: \n" + Utility.dumpByteArray(event.data), e); logger.warn("sender was: " + event.channel.socket().getRemoteSocketAddress()); stats.add("Message invalid version", 1); *************** *** 336,343 **** sendMessage(invMsg); } catch (IOException e) { ! logger.warn("IOException while building message:" , e); logger.warn("sender was: " + event.channel.socket().getRemoteSocketAddress()); } catch (RuntimeException e) { ! logger.warn("RuntimeException while building message:" , e); logger.warn("sender was: " + event.channel.socket().getRemoteSocketAddress()); } --- 337,344 ---- sendMessage(invMsg); } catch (IOException e) { ! logger.warn("IOException while building message:\n" + Utility.dumpByteArray(event.data), e); logger.warn("sender was: " + event.channel.socket().getRemoteSocketAddress()); } catch (RuntimeException e) { ! logger.warn("RuntimeException while building message:\n" + Utility.dumpByteArray(event.data), e); logger.warn("sender was: " + event.channel.socket().getRemoteSocketAddress()); } |