Author: nextgens
Date: 2008-08-18 18:04:05 +0000 (Mon, 18 Aug 2008)
New Revision: 22015
Modified:
trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
Log:
Give a 3h grace time to the normal update process before UoM is allowed to kick
in
Modified: trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-08-18 18:01:15 UTC (rev 22014)
+++ trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-08-18 18:04:05 UTC (rev 22015)
@@ -79,7 +79,7 @@
/** Maximum time between asking for the main jar and it starting to
transfer */
static final int REQUEST_MAIN_JAR_TIMEOUT = 60*1000;
//** Grace time before we use UoM to update */
- public static final int GRACE_TIME = 60*60*1000; // 1h
+ public static final int GRACE_TIME = 3*60*60*1000; // 3h
private boolean logMINOR;
private UserAlert alert;
@@ -227,8 +227,8 @@
// If we have fetches running already, then
sendUOMRequestMain() will add the offer to nodesOfferedMainJar,
// so that if all our fetches fail, we can
fetch from this node.
if(!isOutdated) {
- Logger.error(this, "The update
process seems to have been stuck for over an hour; let's switch to UoM! SHOULD
NOT HAPPEN! (1)");
- System.out.println("The update
process seems to have been stuck for over an hour; let's switch to UoM! SHOULD
NOT HAPPEN! (1)");
+ Logger.error(this, "The update
process seems to have been stuck for over three hours; let's switch to UoM!
SHOULD NOT HAPPEN! (1)");
+ System.out.println("The update
process seems to have been stuck for over three hours; let's switch to UoM!
SHOULD NOT HAPPEN! (1)");
} else
if(logMINOR) Logger.minor(this,
"Fetching via UOM as our build is deprecated");
// Fetch it
