[Thaw-dev] r12731 - in trunk/apps/Thaw/src/thaw: core fcp

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-04-14 22:15:43 +0000 (Sat, 14 Apr 2007)
New Revision: 12731

Modified:
   trunk/apps/Thaw/src/thaw/core/Logger.java
   trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
   trunk/apps/Thaw/src/thaw/fcp/FCPTestDDA.java
   trunk/apps/Thaw/src/thaw/fcp/SHA256Computer.java
Log:
Update the status of a FCPClientPut request when computing hash

Modified: trunk/apps/Thaw/src/thaw/core/Logger.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Logger.java   2007-04-14 22:08:49 UTC (rev 
12730)
+++ trunk/apps/Thaw/src/thaw/core/Logger.java   2007-04-14 22:15:43 UTC (rev 
12731)
@@ -22,7 +22,7 @@
         * 2 or more is recommanded.
         * 4 or more is unhealthy
         */
-       public final static int LOG_LEVEL = 5;
+       public final static int LOG_LEVEL = 3;

        private static Vector logListeners = null;


Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java      2007-04-14 22:08:49 UTC 
(rev 12730)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java      2007-04-14 22:15:43 UTC 
(rev 12731)
@@ -204,6 +204,8 @@
                sha = null;

                if 
(queueManager.getQueryManager().getConnection().isLocalSocket()) {
+                       status = "Computing hash to get approval from the node 
...";
+
                        sha = new 
SHA256Computer(queueManager.getQueryManager().getConnection().getClientHello().getConnectionId()
                                                 +"-"+ (localFile != null ? 
localFile.getPath() : "")
                                                 +"-",

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPTestDDA.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPTestDDA.java        2007-04-14 22:08:49 UTC 
(rev 12730)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPTestDDA.java        2007-04-14 22:15:43 UTC 
(rev 12731)
@@ -118,6 +118,7 @@

                FCPMessage msg = (FCPMessage)param;

+               /* TOREMOVE when all the node will be up-to-date */
                if ("ProtocolError".equals(msg.getMessageName())) {
                        if ("7".equals(msg.getValue("Code"))) {
                                Logger.warning(this, "Node doesn't support 
TestDDA (-> ProtocolError) => DDA desactivated");

Modified: trunk/apps/Thaw/src/thaw/fcp/SHA256Computer.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/SHA256Computer.java    2007-04-14 22:08:49 UTC 
(rev 12730)
+++ trunk/apps/Thaw/src/thaw/fcp/SHA256Computer.java    2007-04-14 22:15:43 UTC 
(rev 12731)
@@ -10,6 +10,11 @@

 import thaw.core.Logger;

+
+/**
+ * Automatically used by FCPClientPut.
+ * You shouldn't have to bother about it
+ */
 public class SHA256Computer extends Observable implements Runnable {
        private SHA256 sha;