boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

corrections

Browse Source 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@262 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 20 years ago
parent 361ba50056
commit 878ff0ae7b
8 changed files with 15 additions and 83 deletions
Show Stats Download Patch File Download Diff File

1
build.xml
Unescape View File

@ -233,6 +233,7 @@
<!-- copy configuration files -->
<tarfileset dir="." dirmode="${accessRightsDir}" mode="${accessRightsFile}" prefix="${releaseDir}">
<include name="yacy.logging"/>
<include name="yacy.init"/>
<include name="yacy.yellow"/>
<include name="yacy.black"/>

2
htroot/Blacklist_p.java
Unescape View File

@ -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

2
htroot/Network.html
Unescape View File

@ -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 <a href="http://www.anomic.de/AnomicHTTPProxy/Installation.html#wininst">here</a>
('on-demand - mode', see <a href="http://www.yacy.net/yacy/Installation.html#wininst">here</a>
for an installation guide) or you can go online by activating the permanent online mode.
To do this, press this button:
<form action="SettingsAck_p.html" method="get">

2
htroot/Settings_p.html
Unescape View File

@ -9,7 +9,7 @@
<br><br>
<h2>Settings</h2>
<p>This is the configuration page for the AnomicHTTPProxy. Access to this page should be limited to an administration person only.
<p>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.</p>
<p>If you want to restore all settings to the default values,
but <b>forgot your administration password</b>, you must stop the proxy,

4
htroot/Status.html
Unescape View File

@ -34,7 +34,7 @@ Your settings are protected by a password.
#(/protection)#
</td></tr>
<tr class="TableCellLight"><td>System version</td><td>
#[version]##(versioncomment)#:: - the latest public version is #[latestVersion]#. Click here to <a href="http://www.anomic.de/AnomicHTTPProxy/Download.html">download</a> it.#(/versioncomment)#
#[version]##(versioncomment)#:: - the latest public version is #[latestVersion]#. Click here to <a href="http://www.yacy.net/yacy/Download.html">download</a> it.#(/versioncomment)#
</td></tr>
<tr class="TableCellDark"><td>Proxy host</td><td>#[host]#:#[port]#</td></tr>
<tr class="TableCellLight"><td>Remote proxy</td><td>#(remoteProxy)#not used::#[host]#:#[port]##(/remoteProxy)#</td></tr>
@ -62,7 +62,7 @@ Connects(#[juniorConnects]#|#[seniorConnects]#|#[principalConnects]#|#[disconnec
</td></tr>
<tr class="TableCellLight"><td>This peer's status</td><td>
#(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: <a href="http://www.anomic.de/AnomicHTTPProxy/Installation.html#wininst">configure your browser's proxy settings</a> 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: <a href="http://www.yacy.net/yacy/Installation.html#wininst">configure your browser's proxy settings</a> 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 <a href="index.html">search the internet</a> 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.
::

2
htroot/yacy/list.java
Unescape View File

@ -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

77
source/de/anomic/server/logging/serverLog.java
Unescape View File

@ -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);
}
}

8
yacy.logging
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save