logging, including replacing the scary monster with its true self (we had data...

logging, including replacing the scary monster with its true self (we had data queued up, but were unable to get an ACK on our last write)

apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketImpl.java

@@ -454,7 +454,8 @@ class I2PSocketImpl implements I2PSocket {
                         _log.debug(getPrefix() + "Message size is: " + data.length);
                     boolean sent = sendBlock(data);
                     if (!sent) {
-                        _log.error(getPrefix() + "Error sending message to peer.  Killing socket runner");
+                        if (_log.shouldLog(Log.WARN))
+                            _log.warn(getPrefix() + "Error sending message to peer.  Killing socket runner");
                         errorOccurred();
                         return false;
                     }
@@ -475,9 +476,10 @@ class I2PSocketImpl implements I2PSocket {
                     packetsHandled++;
                 }
                 if ((bc.getCurrentSize() > 0) && (packetsHandled > 1)) {
-                    _log.error(getPrefix() + "A SCARY MONSTER HAS EATEN SOME DATA! " + "(input stream: " 
-                               + in.hashCode() + "; "
-                               + "queue size: " + bc.getCurrentSize() + ")");
+                    if (_log.shouldLog(Log.WARN))
+                        _log.warn(getPrefix() + "We lost some data queued up due to a network send error (input stream: " 
+                                  + in.hashCode() + "; "
+                                  + "queue size: " + bc.getCurrentSize() + ")");
                 }
                 synchronized (flagLock) {
                     closed2 = true;
@@ -492,7 +494,8 @@ class I2PSocketImpl implements I2PSocket {
                     byte[] packet = I2PSocketManager.makePacket(getMask(0x02), remoteID, new byte[0]);
                     boolean sent = manager.getSession().sendMessage(remote, packet);
                     if (!sent) {
-                        _log.error(getPrefix() + "Error sending close packet to peer");
+                        if (_log.shouldLog(Log.WARN))
+                            _log.warn(getPrefix() + "Error sending close packet to peer");
                         errorOccurred();
                     }
                 }

apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java

@@ -264,7 +264,8 @@ public class I2PSocketManager implements I2PSessionListener {
             s.queueData(payload);
             return;
         } else {
-            _log.error(getName() + ": Null socket with data available");
+            if (_log.shouldLog(Log.WARN))
+                _log.warn(getName() + ": Null socket with data available");
             throw new IllegalStateException("Null socket with data available");
         }
     }