diff --git a/defaults/yacy.init b/defaults/yacy.init index c9af37465..ef182ea68 100644 --- a/defaults/yacy.init +++ b/defaults/yacy.init @@ -851,10 +851,6 @@ useYacyReferer = false # if you want to tunnel other protocols, set to false secureHttps = true -# specifies if the httpdFileHandler should cache -# the template-files from the htroot directory -enableTemplateCache = true - # specifies if the http post body should be transfered # using content-encoding gzip during index transfer # a) indexDistribution: which is done periodically if you have enabled diff --git a/source/net/yacy/peers/Network.java b/source/net/yacy/peers/Network.java index 2879f840a..305e63bdc 100644 --- a/source/net/yacy/peers/Network.java +++ b/source/net/yacy/peers/Network.java @@ -71,7 +71,6 @@ public class Network public static final ThreadGroup publishThreadGroup = new ThreadGroup("publishThreadGroup"); public static final HashMap seedUploadMethods = new HashMap(); public static final ConcurrentLog log = new ConcurrentLog("YACY"); - public static long lastOnlineTime = 0; /** pseudo-random key derived from a time-interval while YaCy startup */ public static long speedKey = 0; public static long magic = System.currentTimeMillis(); @@ -121,11 +120,6 @@ public class Network // ATTENTION, VERY IMPORTANT: before starting the thread, the httpd yacy server must be running! speedKey = System.currentTimeMillis() - time; - lastOnlineTime = 0; - } - - synchronized static public void triggerOnlineAction() { - lastOnlineTime = System.currentTimeMillis(); } public final void publishSeedList() { diff --git a/source/net/yacy/server/http/HTTPDFileHandler.java b/source/net/yacy/server/http/HTTPDFileHandler.java index 5658693a1..556ffd9c2 100644 --- a/source/net/yacy/server/http/HTTPDFileHandler.java +++ b/source/net/yacy/server/http/HTTPDFileHandler.java @@ -77,19 +77,11 @@ public final class HTTPDFileHandler { private static File htLocalePath = null; public static String indexForward = ""; - protected static final class TemplateCacheEntry { - Date lastModified; - byte[] content; - } - - public static final boolean useTemplateCache; - //private Properties connectionProperties = null; // creating a logger static { final serverSwitch theSwitchboard = Switchboard.getSwitchboard(); - useTemplateCache = theSwitchboard.getConfig("enableTemplateCache","true").equalsIgnoreCase("true"); if (switchboard == null) { switchboard = theSwitchboard; diff --git a/source/net/yacy/server/http/HTTPDProxyHandler.java b/source/net/yacy/server/http/HTTPDProxyHandler.java index ea3930edd..b26ba0ef8 100644 --- a/source/net/yacy/server/http/HTTPDProxyHandler.java +++ b/source/net/yacy/server/http/HTTPDProxyHandler.java @@ -121,7 +121,7 @@ public final class HTTPDProxyHandler { if (sb != null) { // set timeout - timeout = Integer.parseInt(sb.getConfig("proxy.clientTimeout", "60000")); + timeout = sb.getConfigInt("proxy.clientTimeout", 60000); // do logger initialization try { @@ -276,7 +276,6 @@ public final class HTTPDProxyHandler { // remembering the starting time of the request final Date requestDate = new Date(); // remember the time... conProp.put(HeaderFramework.CONNECTION_PROP_REQUEST_START, Long.valueOf(requestDate.getTime())); - if (yacyTrigger) net.yacy.peers.Network.triggerOnlineAction(); sb.proxyLastAccess = System.currentTimeMillis(); // using an ByteCount OutputStream to count the send bytes (needed for the logfile)