Author: toad
Date: 2008-12-16 19:05:44 +0000 (Tue, 16 Dec 2008)
New Revision: 24386
Modified:
trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
Log:
Logging
Modified: trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-12-16 19:05:12 UTC (rev 24385)
+++ trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-12-16 19:05:44 UTC (rev 24386)
@@ -245,7 +245,7 @@
whenToTakeOverTheNormalUpdater =
System.currentTimeMillis() + GRACE_TIME;
boolean isOutdated = updateManager.node.isOudated();
// if the new build is self-mandatory or if the "normal"
updater has been trying to update for more than one hour
- Logger.normal(this, "We received a valid UOMAnnounce :
(isOutdated=" + isOutdated + " version=" + mainJarVersion + "
whenToTakeOverTheNormalUpdater=" +
TimeUtil.formatTime(whenToTakeOverTheNormalUpdater - now) + ") file length " +
mainJarFileLength + " updateManager version " +
updateManager.newMainJarVersion());
+ Logger.normal(this, "We received a valid UOMAnnounce (main) :
(isOutdated=" + isOutdated + " version=" + mainJarVersion + "
whenToTakeOverTheNormalUpdater=" +
TimeUtil.formatTime(whenToTakeOverTheNormalUpdater - now) + ") file length " +
mainJarFileLength + " updateManager version " +
updateManager.newMainJarVersion());
if(mainJarVersion > Version.buildNumber() && mainJarFileLength
> 0 &&
mainJarVersion > updateManager.newMainJarVersion()) {
source.setMainJarOfferedVersion(mainJarVersion);
@@ -311,7 +311,7 @@
whenToTakeOverTheNormalUpdater =
System.currentTimeMillis() + GRACE_TIME;
boolean isOutdated = updateManager.node.isOudated();
// if the new build is self-mandatory or if the "normal"
updater has been trying to update for more than one hour
- Logger.normal(this, "We received a valid UOMAnnounce :
(isOutdated=" + isOutdated + " version=" + extJarVersion + "
whenToTakeOverTheNormalUpdater=" +
TimeUtil.formatTime(whenToTakeOverTheNormalUpdater - now) + ") file length " +
extJarFileLength + " updateManager version " +
updateManager.newExtJarVersion());
+ Logger.normal(this, "We received a valid UOMAnnounce (ext) :
(isOutdated=" + isOutdated + " version=" + extJarVersion + "
whenToTakeOverTheNormalUpdater=" +
TimeUtil.formatTime(whenToTakeOverTheNormalUpdater - now) + ") file length " +
extJarFileLength + " updateManager version " +
updateManager.newExtJarVersion());
if(extJarVersion > NodeStarter.extBuildNumber &&
extJarFileLength > 0 &&
extJarVersion > updateManager.newExtJarVersion()) {
source.setExtJarOfferedVersion(extJarVersion);
@@ -368,8 +368,8 @@
}
private void sendUOMRequest(final PeerNode source, boolean addOnFail,
final boolean isExt) {
- final String name = isExt ? "Main" : "Extra";
- String lname = isExt ? "main" : "ext";
+ final String name = isExt ? "Extra" : "Main";
+ String lname = isExt ? "ext" : "main";
if(logMINOR)
Logger.minor(this, "sendUOMRequest"+name+"(" + source +
"," + addOnFail + ")");
if(!source.isConnected())
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
