[Thaw-dev] r16560 - in trunk/apps/Thaw/src/thaw: fcp plugins/signatures

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-12-15 01:29:35 +0000 (Sat, 15 Dec 2007)
New Revision: 16560

Modified:
   trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
   trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java
   trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java
Log:
Improve a little bit logs readability

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java      2007-12-15 01:09:17 UTC 
(rev 16559)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java      2007-12-15 01:29:35 UTC 
(rev 16560)
@@ -510,7 +510,8 @@
                                return;
                        }

-                       Logger.notice(this, "GetFailed : 
"+message.getValue("CodeDescription"));
+                       if (!"13".equals(message.getValue("Code"))) /* if != of 
Data Not Found */
+                               Logger.notice(this, "GetFailed : 
"+message.getValue("CodeDescription"));


                        if(!isRunning()) { /* Must be a "GetFailed: cancelled 
by caller", so we simply ignore */
@@ -945,6 +946,7 @@

                if(!isPersistent()) {
                        Logger.notice(this, "Can't remove non persistent 
request.");
+
                        return false;
                }

@@ -992,7 +994,7 @@
        public boolean stop(final FCPQueueManager queryManager) {
                Logger.info(this, "Stop fetching of the key : "+getFileKey());

-               if(!removeRequest())
+               if(isPersistent() && !removeRequest())
                        return false;

                boolean wasFinished = isFinished();

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java    2007-12-15 01:09:17 UTC 
(rev 16559)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java    2007-12-15 01:29:35 UTC 
(rev 16560)
@@ -12,7 +12,7 @@
  *       and start() returns false.
  */
 public class FCPClientHello implements FCPQuery, Observer {
-       public final static int NODEHELLO_TIMEOUT = 30; /* in seconds */
+       public final static int NODEHELLO_TIMEOUT = 60; /* in seconds */

        private final static String FCP_EXPECTED_VERSION = "2.0";
        private String id;

Modified: trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java   2007-12-15 
01:09:17 UTC (rev 16559)
+++ trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java   2007-12-15 
01:29:35 UTC (rev 16560)
@@ -513,8 +513,8 @@
                        initFrostCrypt();
                        return frostCrypt.detachedVerify(text, publicKey, sig);
                } catch(Exception e) {
-                       Logger.notice(this, "signature check failed because: 
"+e.toString());
-                       e.printStackTrace();
+                       Logger.info(this, "Exception while checking signature: 
"+e.toString());
+                       //e.printStackTrace();
                        return false;
                }
        }