mirror of
https://github.com/yacy/yacy_search_server.git
synced 2024-09-19 00:01:41 +02:00
fixed port parsing during shutdown for extended port format
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1812 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
parent
f0041d504d
commit
3173b5c9b3
|
@ -299,8 +299,6 @@ public final class yacy {
|
|||
yacyCore.latestVersion = version;
|
||||
|
||||
// read environment
|
||||
//new
|
||||
final String port = sb.getConfig("port", "8080");
|
||||
int timeout = Integer.parseInt(sb.getConfig("httpdTimeout", "60000"));
|
||||
if (timeout < 60000) timeout = 60000;
|
||||
|
||||
|
@ -359,6 +357,7 @@ public final class yacy {
|
|||
migration.migrate(sb, oldRev, newRev);
|
||||
|
||||
// start main threads
|
||||
final String port = sb.getConfig("port", "8080");
|
||||
try {
|
||||
final httpd protocolHandler = new httpd(sb, new httpdFileHandler(sb), new httpdProxyHandler(sb));
|
||||
final serverCore server = new serverCore(
|
||||
|
@ -562,7 +561,7 @@ public final class yacy {
|
|||
Properties config = configuration("REMOTE-SHUTDOWN", homePath);
|
||||
|
||||
// read port
|
||||
int port = Integer.parseInt((String) config.get("port"));
|
||||
int port = serverCore.getPortNr(config.getProperty("port", "8080"));
|
||||
|
||||
// read password
|
||||
String encodedPassword = (String) config.get("adminAccountBase64MD5");
|
||||
|
|
Loading…
Reference in New Issue
Block a user