diff --git a/build.xml b/build.xml index 05cfc9c52..0cd4e3d6f 100644 --- a/build.xml +++ b/build.xml @@ -233,6 +233,7 @@ + diff --git a/htroot/Blacklist_p.java b/htroot/Blacklist_p.java index e97978c40..1d2e37310 100644 --- a/htroot/Blacklist_p.java +++ b/htroot/Blacklist_p.java @@ -1,6 +1,6 @@ // Blacklist_p.java // ----------------------- -// part of the AnomicHTTPProxy +// part of YaCy // (C) by Michael Peter Christen; mc@anomic.de // first published on http://www.anomic.de // Frankfurt, Germany, 2004 diff --git a/htroot/Network.html b/htroot/Network.html index 7444886df..34b740049 100644 --- a/htroot/Network.html +++ b/htroot/Network.html @@ -165,7 +165,7 @@ You are in online mode, but probably no internet resource is available. Please c :: You are either not in online mode or you do not use the proxy option. To get connection to the YACY network, you must use the proxy by setting your browsers settings -('on-demand - mode', see here +('on-demand - mode', see here for an installation guide) or you can go online by activating the permanent online mode. To do this, press this button:
diff --git a/htroot/Settings_p.html b/htroot/Settings_p.html index 3d58b0854..c43a0bed4 100644 --- a/htroot/Settings_p.html +++ b/htroot/Settings_p.html @@ -9,7 +9,7 @@

Settings

-

This is the configuration page for the AnomicHTTPProxy. Access to this page should be limited to an administration person only. +

This is the configuration page for YaCy. Access to this page should be limited to an administration person only. To restrict the access to this page, please set an administrator account and password below.

If you want to restore all settings to the default values, but forgot your administration password, you must stop the proxy, diff --git a/htroot/Status.html b/htroot/Status.html index d5f0300de..dcb6929cb 100644 --- a/htroot/Status.html +++ b/htroot/Status.html @@ -34,7 +34,7 @@ Your settings are protected by a password. #(/protection)# System version -#[version]##(versioncomment)#:: - the latest public version is #[latestVersion]#. Click here to download it.#(/versioncomment)# +#[version]##(versioncomment)#:: - the latest public version is #[latestVersion]#. Click here to download it.#(/versioncomment)# Proxy host#[host]#:#[port]# Remote proxy#(remoteProxy)#not used::#[host]#:#[port]##(/remoteProxy)# @@ -62,7 +62,7 @@ Connects(#[juniorConnects]#|#[seniorConnects]#|#[principalConnects]#|#[disconnec This peer's status #(peerStatus)# -Virgin - You have not yet published your peer, because you have not yet used the proxy. If you configured your proxy setting (see online: configure your browser's proxy settings and go online by browsing the internet) you must first load any page through the proxy to prove that this works. With this status you are not allowed to search other peers. +Virgin - You have not yet published your peer, because you have not yet used the proxy. If you configured your proxy setting (see online: configure your browser's proxy settings and go online by browsing the internet) you must first load any page through the proxy to prove that this works. With this status you are not allowed to search other peers. :: Junior - You cannot be reached. A possible reason is that you are behind a firewall, NAT or Router. But you can search the internet using the other peers' global index on your own search page. We encourage you to open your firewall for the port you configured (usually: 8080), or to set up a 'virtual server' in your router settings. Please be fair, contribute your own index to the global index. :: diff --git a/htroot/yacy/list.java b/htroot/yacy/list.java index 3f8f50bbc..0dc9a2474 100644 --- a/htroot/yacy/list.java +++ b/htroot/yacy/list.java @@ -1,6 +1,6 @@ // list.java // ----------------------- -// part of the AnomicHTTPProxy +// part of YaCy // (C) by Michael Peter Christen; mc@anomic.de // first published on http://www.anomic.de // Frankfurt, Germany, 2004 diff --git a/source/de/anomic/server/logging/serverLog.java b/source/de/anomic/server/logging/serverLog.java index 8537b29c0..a62ffb437 100644 --- a/source/de/anomic/server/logging/serverLog.java +++ b/source/de/anomic/server/logging/serverLog.java @@ -57,11 +57,6 @@ import java.util.logging.StreamHandler; public final class serverLog { -// // statics -// private static TimeZone GMTTimeZone = TimeZone.getTimeZone("PST"); -// private static SimpleDateFormat longFormatter = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); -// private static SimpleDateFormat shortFormatter = new SimpleDateFormat("yyyyMMddHHmmss"); -// // // log-level categories public static final int LOGLEVEL_ZERO = Level.OFF.intValue(); // no output at all public static final int LOGLEVEL_FAILURE = Level.SEVERE.intValue(); // system-level error, internal cause, critical and not fixeable (i.e. inconsistency) @@ -80,21 +75,6 @@ public final class serverLog { public static final char LOGTOKEN_INFO = 'I'; public static final char LOGTOKEN_DEBUG = 'D'; -// // an array-wrapped function -// public static final char[] l2t = new char[] { -// LOGTOKEN_ZERO, LOGTOKEN_FAILURE, LOGTOKEN_ERROR, LOGTOKEN_WARNING, -// LOGTOKEN_SYSTEM, LOGTOKEN_INFO, LOGTOKEN_DEBUG -// }; - -// // statics -// private static serverLog genericLog = new serverLog("GENERIC", LOGLEVEL_DEBUG); // generic log -// private static LinkedList lastLog = new LinkedList(); // for Web-Interface -// private static int lastlogMaxSize = 400; // for Web-Interface -// -// // class variables -// private String appName; -// private int logLevel; - private final Logger theLogger; public serverLog(String appName) { @@ -117,41 +97,6 @@ public final class serverLog { // this.logLevel = newLevel; } -// private static int t2l(char token) { -// switch (token) { -// case LOGTOKEN_ZERO: return LOGLEVEL_ZERO; -// case LOGTOKEN_FAILURE: return LOGLEVEL_FAILURE; -// case LOGTOKEN_ERROR: return LOGLEVEL_ERROR; -// case LOGTOKEN_WARNING: return LOGLEVEL_WARNING; -// case LOGTOKEN_SYSTEM: return LOGLEVEL_SYSTEM; -// case LOGTOKEN_INFO: return LOGLEVEL_INFO; -// case LOGTOKEN_DEBUG: return LOGLEVEL_DEBUG; -// } -// return LOGLEVEL_DEBUG; -// } -// -// private static String dateLongString() { -// return longFormatter.format(new GregorianCalendar(GMTTimeZone).getTime()); -// } -// -// private static String dateShortString() { -// return shortFormatter.format(new GregorianCalendar(GMTTimeZone).getTime()); -// } -// -// private void log(int messageLevel, String message) { -// if (messageLevel <= logLevel) { -// System.out.println(l2t[messageLevel] + " " + dateLongString() + " " + appName + " " + message); -// synchronized (lastLog) { -// lastLog.add(l2t[messageLevel] + " " + dateLongString() + " " + appName + " " + message); -// while (lastLog.size() > lastlogMaxSize) lastLog.removeFirst(); -// } -// } -// } - -// public static LinkedList getLastLog(){ -// return lastLog; -// } - // class log messages public void logFailure(String message) {this.theLogger.severe(message);} public void logError(String message) {this.theLogger.severe(message);} @@ -163,8 +108,6 @@ public final class serverLog { // static log messages: log everything private static void log(String appName, int messageLevel, String message) { -// genericLog.appName = appName; -// genericLog.log(messageLevel, message); Logger.getLogger(appName).log(Level.parse(Integer.toString(messageLevel)),message); } @@ -187,25 +130,5 @@ public final class serverLog { // generating the root logger Logger logger = Logger.getLogger(""); - - //StreamHandler stdOut = new StreamHandler(System.out, new serverSimpleLogFormatter()); -// ConsoleOutErrHandler stdOutErr = new ConsoleOutErrHandler(); -// stdOutErr.setFormatter(new serverSimpleLogFormatter()); -// stdOutErr.setLevel(Level.ALL); -// stdOutErr.setLevels(Level.ALL,Level.WARNING,Level.ALL); -// -// FileHandler fileLog = new FileHandler("log/yacy%u%g.log",1024*1024, 20, true); -// fileLog.setFormatter(new serverSimpleLogFormatter()); -// fileLog.setLevel(Level.ALL); -// -// GuiHandler guiLog = new GuiHandler(); -// guiLog.setFormatter(new serverSimpleLogFormatter()); -// fileLog.setLevel(Level.ALL); -// -// logger.addHandler(fileLog); -// logger.addHandler(stdOutErr); -// logger.addHandler(guiLog); - - } } diff --git a/yacy.logging b/yacy.logging index 9193284bf..0101b8827 100644 --- a/yacy.logging +++ b/yacy.logging @@ -3,6 +3,14 @@ .level=ALL # setting logging levels vor individual classes +# possible values are: +# ZERO no output at all +# FAILURE system-level error, internal cause, critical and not fixeable (i.e. inconsistency) +# ERROR exceptional error, catcheable and non-critical (i.e. file error) +# WARNING uncritical service failure, may require user activity (i.e. input required, wrong authorization) +# SYSTEM regular system status information (i.e. start-up messages) +# INFO regular action information (i.e. any httpd request URL) +# DEBUG in-function status debug output PARSER.level = INFO YACY.level = INFO HTCACHE.level = INFO