logging cleanups

apps/streaming/java/src/net/i2p/client/streaming/MessageOutputStream.java

@@ -389,6 +389,7 @@ class MessageOutputStream extends OutputStream {
         // should we? To be researched further.
         // false -> wait for completion, not just accept.
         flush(false);
+        if (_log.shouldLog(Log.DEBUG))
             _log.debug("Output stream closed after writing " + _written);
         ByteArray ba = null;
         synchronized (_dataLock) {

core/java/src/net/i2p/util/SimpleScheduler.java

@@ -174,11 +174,15 @@ public class SimpleScheduler {
             long time = System.currentTimeMillis() - before;
             if (time > 1000 && _log.shouldLog(Log.WARN))
                 _log.warn(_name + " wtf, event execution took " + time + ": " + _timedEvent);
+            if (_log.shouldLog(Log.INFO)) {
+                 // this call is slow - iterates through a HashMap -
+                 // would be better to have a local AtomicLong if we care
                  long completed = _executor.getCompletedTaskCount();
-            if (_log.shouldLog(Log.INFO) && completed % 250  == 0)
+                 if (completed % 250 == 0)
                      _log.info(debug());
             }
         }
+    }
 
     /** Run every timeoutMs. TimedEvent must not do its own reschedule via addEvent() */
     private class PeriodicRunnableEvent extends RunnableEvent {

core/java/src/net/i2p/util/SimpleTimer2.java

@@ -368,10 +368,14 @@ public class SimpleTimer2 {
             long time = System.currentTimeMillis() - before;
             if (time > 500 && _log.shouldLog(Log.WARN))
                 _log.warn(_pool + " wtf, event execution took " + time + ": " + this);
+            if (_log.shouldLog(Log.INFO)) {
+                 // this call is slow - iterates through a HashMap -
+                 // would be better to have a local AtomicLong if we care
                  long completed = _pool.getCompletedTaskCount();
-            if (_log.shouldLog(Log.INFO) && completed % 250  == 0)
+                 if (completed % 250 == 0)
                      _log.info(_pool.debug());
             }
+        }
 
         /** 
          * Simple interface for events to be queued up and notified on expiration
@@ -387,6 +391,7 @@ public class SimpleTimer2 {
         return _name;
     }
 
+    /** warning - slow */
     private long getCompletedTaskCount() {
         return _executor.getCompletedTaskCount();
     }

router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java

@@ -449,6 +449,7 @@ class PersistentDataStore extends TransientDataStore {
                             // so add it here.
                             getContext().profileManager().heardAbout(ri.getIdentity().getHash(), ri.getPublished());
                         } catch (IllegalArgumentException iae) {
+                            if (_log.shouldLog(Log.INFO))
                                 _log.info("Refused locally loaded routerInfo - deleting", iae);
                             corrupt = true;
                         }
@@ -524,10 +525,12 @@ class PersistentDataStore extends TransientDataStore {
         File f = new File(dir, riName);
         if (f.exists()) {
             boolean removed = f.delete();
-            if (!removed)
+            if (!removed) {
+                if (_log.shouldLog(Log.WARN))
                     _log.warn("Unable to remove router info at " + f.getAbsolutePath());
-            else
+            } else if (_log.shouldLog(Log.INFO)) {
                 _log.info("Removed router info at " + f.getAbsolutePath());
+            }
             return;
         }
     }