Cleaning up logging

WORKSPACE

@@ -23,7 +23,7 @@ maven_jar(
 git_repository(
   name = "snowblossom",
   remote = "https://github.com/snowblossomcoin/snowblossom",
-  tag = "1.5.2.5",
+  tag = "1.6.0",
 )
 
 git_repository(

src/ApiUtils.java

@@ -209,7 +209,7 @@ public static SignedMessage getContentFromJson(JSONObject input, ChannelNode nod
 		WalletDatabase wdb = node.getWalletDB();
 
     TxOutPoint fbo_out = getFboOutpoint(node, wdb.getAddresses(0));
-    System.out.println("FBO OUT: " + fbo_out);
+    //System.out.println("FBO OUT: " + fbo_out);
 
 
     SignedMessagePayload.Builder payload = SignedMessagePayload.newBuilder();

src/ChannelGlobals.java

@@ -2,7 +2,7 @@
 
 public class ChannelGlobals
 {
-  public static final String VERSION = "dev.11.09.1";
+  public static final String VERSION = "dev.2019.11.16.0";
 
   public static final String NODE_ADDRESS_STRING="node";
   public static final String CHANNEL_ADDRESS_STRING="chan";

src/ChannelLink.java

@@ -198,7 +198,7 @@ public void onNext(ChannelPeerMessage msg)
 
           ChannelBlockHeader header = ChannelValidation.checkBlockHeaderBasics(cid, tip.getBlockHeader());
           ChainHash hash = new ChainHash(tip.getBlockHeader().getMessageId());
-          logger.info(String.format("Channel %s got tip from remote %d %s ", cid.asString(), header.getBlockHeight(), hash.toString()));
+          logger.fine(String.format("Channel %s got tip from remote %d %s ", cid.asString(), header.getBlockHeight(), hash.toString()));
           considerChannelHeader(hash, header);
         }
       }

src/ChannelPeerMaintainer.java

@@ -79,7 +79,7 @@ public void runPass() throws Exception
 
         // TODO - save good peers in DB in case the DHT is trashed in some way
         LinkedList<ChannelPeerInfo> possible_peers = getAllDHTPeers(cid, dht_element_lst, connected_set);
-        logger.info(String.format("Channel %s: connected %d possible %d", cid.asString(), links.size(), possible_peers.size()));
+        logger.fine(String.format("Channel %s: connected %d possible %d", cid.asString(), links.size(), possible_peers.size()));
         Collections.shuffle(possible_peers);
 
         // TODO - be better about not hammering down/bad nodes with connects
@@ -131,7 +131,7 @@ private void saveDHT(ChannelID cid, List<ByteString> dht_element_lst, ChannelPee
           	.setDesiredResultCount(0)
           	.setSignedDhtData(sm)
         	.build()); 
-        logger.info(String.format("DHT Saved %s for %s", new ChainHash(element_id), cid.asString()));
+        logger.fine(String.format("DHT Saved %s for %s", new ChainHash(element_id), cid.asString()));
 
         node.getDHTCache().markWrite(element_id);
       }

src/DHTCache.java

@@ -82,7 +82,7 @@ public void onCompleted(){}
     @Override
     public void onError(Throwable t)
     {
-      logger.warning("Error in get DHT data: " + t);
+      logger.fine("Error in get DHT data: " + t);
     }
 
     @Override

src/DHTMaintainer.java

@@ -97,15 +97,15 @@ public void runPass() throws Exception
         }
       }
     }
-    logger.info("Connected peers: " + connected_peers);
-    logger.info("New connections: " + connect_map.keySet());
+    logger.fine("Connected peers: " + connected_peers);
+    logger.fine("New connections: " + connect_map.keySet());
     int desired_peers = ChannelGlobals.NEAR_POINTS + ChannelGlobals.RING_DIVISONS * 2;
     int to_close_count = connected_peers.size() - desired_peers;
     while ((to_close_count > 0) && (extra_peers.size() > 0))
     {
       AddressSpecHash id = extra_peers.pollFirst();
       to_close_count--;
-      logger.info("Closed extra peer: " + id);
+      logger.fine("Closed extra peer: " + id);
       node.getPeerManager().removeReason(id, "DHT");
     }
 
@@ -117,7 +117,7 @@ public void runPass() throws Exception
       }
       catch(Exception e)
       {
-        logger.info("Connect failed: " + e);
+        logger.fine("Connect failed: " + e);
       }
     }
     synchronized(connection_attempt_times)
@@ -281,24 +281,6 @@ public static List<ChannelPeerInfo> getSeeds()
         .build())
       .build());
 
-
-    /*seed_list.add( ChannelPeerInfo.newBuilder()
-      .setAddressSpecHash(AddressUtil.getHashForAddress(ChannelGlobals.NODE_ADDRESS_STRING, 
-        "node:dqh252gynxjsw5a8pzz306xvra8r2v3wz9x8xc6m").getBytes())
-      .setVersion("seed")
-      .putConnectInfos("ipv4", ConnectInfo.newBuilder()
-        .setProtocol("ipv4")
-        .setHost("snow-tx1.snowblossom.org")
-        .setPort(ChannelGlobals.NETWORK_PORT)
-        .build())
-      .putConnectInfos("ipv6", ConnectInfo.newBuilder()
-        .setProtocol("ipv6")
-        .setHost("snow-tx1.snowblossom.org")
-        .setPort(ChannelGlobals.NETWORK_PORT)
-        .build())
-      .build());*/
-
-
     return seed_list;
 
   }

src/DHTServer.java

@@ -107,10 +107,8 @@ public SignedMessage getSignedPeerInfoSelf()
     p.setPeerInfo( node.getNetworkExaminer().createPeerInfo() );
 
     return node.signMessage(p.build());
-
   }
 
-
   @Override
   public void storeDHTData(StoreDHTRequest req, StreamObserver<DHTDataSet> o)
   {

src/SocksServer.java

@@ -15,7 +15,6 @@
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 
-
 /**
  * A super simple socks5 server that directs things towards a specific port regardless of what it is asked
  */
@@ -106,7 +105,7 @@ public void run()
 
           }
           sb.append(")");
-          logger.log(Level.INFO, sb.toString());
+          logger.log(Level.FINE, sb.toString());
         }
 
 
@@ -164,7 +163,7 @@ else if (address_type == 4)
           }
           int port = readShortAsUnsigned(in);
 
-          logger.log(Level.INFO, String.format("Socks request v%d c%d a%d %s %d", ver, cmd, address_type, addr_str, port));
+          logger.log(Level.FINE, String.format("Socks request v%d c%d a%d %s %d", ver, cmd, address_type, addr_str, port));
 
           int success = 0;
           Socket relay_sock = null;
@@ -291,7 +290,6 @@ private static int readShortAsUnsigned(DataInputStream in)
   private static void writeShortAsUnsigned(OutputStream out, int v)
     throws IOException
   {
-    logger.info("Port: " +v);
     byte[] b = new byte[4];
     ByteBuffer bb = ByteBuffer.wrap(b);
     bb.putInt(v);

src/WebServer.java

@@ -68,7 +68,7 @@ public void handle(HttpExchange t) throws IOException {
       int code = 200;
 
       URI uri = t.getRequestURI();
-      logger.info("Web request: " + uri);
+      logger.fine("Web request: " + uri);
 
       print_out.println("Request: " + uri);