AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates: Unsigned update improvements

Browse Source
This commit is contained in:
zzz
2023-10-10 12:17:21 +00:00
parent 4c7846be2c
commit df4b3c0d13
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
View File

@@ -866,7 +866,12 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
if (!oldSources.contains(uri)) {
if (_log.shouldLog(Log.WARN))
_log.warn(ui.toString() + ' ' + oldVA + " adding " + uri + " to method " + method);
oldSources.add(uri);
try {
oldSources.add(uri);
} catch (UnsupportedOperationException uoe) {
// rare case, changed URL but it's a singleton list, replace old list
oldVA.sourceMap.put(method, Collections.singletonList(uri));
}
}
}
} else {

22
apps/routerconsole/java/src/net/i2p/router/update/UnsignedUpdateChecker.java
View File

@@ -3,6 +3,7 @@ package net.i2p.router.update;
import java.net.URI;
import java.util.List;
import net.i2p.data.DataHelper;
import net.i2p.router.RouterContext;
import net.i2p.router.web.ConfigUpdateHandler;
import net.i2p.update.*;
@@ -37,6 +38,7 @@ class UnsignedUpdateChecker extends UpdateRunner {
try {
success = fetchUnsignedHead();
} catch (Throwable t) {
_log.error("Error checking for unsigned update", t);
_mgr.notifyTaskFailed(this, "", t);
} finally {
_mgr.notifyCheckComplete(this, _unsignedUpdateAvailable, success);
@@ -69,7 +71,7 @@ class UnsignedUpdateChecker extends UpdateRunner {
}
//updateStatus("<b>" + _t("Checking for development build update") + "</b>");
try {
//try {
EepHead get = new EepHead(_context, proxyHost, proxyPort, 0, url);
if (get.fetch()) {
String lastmod = get.getLastModified();
@@ -92,10 +94,22 @@ class UnsignedUpdateChecker extends UpdateRunner {
}
}
return true;
} else {
int status = get.getStatusCode();
String msg;
if (status == 504 || status <= 0)
msg = "Unable to connect to development update server " + _currentURI.getHost();
else if (status == 500)
msg = "Development update server " + _currentURI.getHost() + " not found in address book";
else if (status == 404)
msg = "Update file not found on development update server at " + url;
else
msg = status + " " + DataHelper.stripHTML(get.getStatusText());
updateStatus("<b>" + msg + "</b>");
}
} catch (Throwable t) {
_log.error("Error fetching the update", t);
}
//} catch (Throwable t) {
// _log.error("Error fetching the update", t);
//}
return false;
}
}