|
|
@ -51,7 +51,6 @@ import net.yacy.peers.Seed;
|
|
|
|
import net.yacy.repository.Blacklist;
|
|
|
|
import net.yacy.repository.Blacklist;
|
|
|
|
import net.yacy.repository.Blacklist.BlacklistType;
|
|
|
|
import net.yacy.repository.Blacklist.BlacklistType;
|
|
|
|
import net.yacy.search.Switchboard;
|
|
|
|
import net.yacy.search.Switchboard;
|
|
|
|
import net.yacy.search.SwitchboardConstants;
|
|
|
|
|
|
|
|
import net.yacy.search.query.SearchEventCache;
|
|
|
|
import net.yacy.search.query.SearchEventCache;
|
|
|
|
import net.yacy.server.serverObjects;
|
|
|
|
import net.yacy.server.serverObjects;
|
|
|
|
import net.yacy.server.serverSwitch;
|
|
|
|
import net.yacy.server.serverSwitch;
|
|
|
@ -140,7 +139,7 @@ public class sharedBlacklist_p {
|
|
|
|
// get List
|
|
|
|
// get List
|
|
|
|
final DigestURL u = new DigestURL(downloadURLOld);
|
|
|
|
final DigestURL u = new DigestURL(downloadURLOld);
|
|
|
|
|
|
|
|
|
|
|
|
otherBlacklist = FileUtils.strings(u.get(agent, sb.getConfig(SwitchboardConstants.ADMIN_ACCOUNT_USER_NAME, "admin"), sb.getConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64MD5, "")));
|
|
|
|
otherBlacklist = FileUtils.strings(u.get(agent, null, null));
|
|
|
|
} catch (final Exception e) {
|
|
|
|
} catch (final Exception e) {
|
|
|
|
prop.put("status", STATUS_PEER_UNKNOWN);
|
|
|
|
prop.put("status", STATUS_PEER_UNKNOWN);
|
|
|
|
prop.putHTML("status_name", hash);
|
|
|
|
prop.putHTML("status_name", hash);
|
|
|
@ -157,7 +156,7 @@ public class sharedBlacklist_p {
|
|
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
final DigestURL u = new DigestURL(downloadURL);
|
|
|
|
final DigestURL u = new DigestURL(downloadURL);
|
|
|
|
otherBlacklist = FileUtils.strings(u.get(agent, sb.getConfig(SwitchboardConstants.ADMIN_ACCOUNT_USER_NAME, "admin"), sb.getConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64MD5, "")));
|
|
|
|
otherBlacklist = FileUtils.strings(u.get(agent, null, null));
|
|
|
|
} catch (final Exception e) {
|
|
|
|
} catch (final Exception e) {
|
|
|
|
prop.put("status", STATUS_URL_PROBLEM);
|
|
|
|
prop.put("status", STATUS_URL_PROBLEM);
|
|
|
|
prop.putHTML("status_address",downloadURL);
|
|
|
|
prop.putHTML("status_address",downloadURL);
|
|
|
|