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

restart re-activated (windows)

Browse Source 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3164 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
borg-0300 18 years ago
parent 27f5a55f77
commit 735c1f87b1
4 changed files with 47 additions and 59 deletions
Show Stats Download Patch File Download Diff File

2
htroot/Status.html
Unescape View File

@ -13,7 +13,7 @@
<form action="Steering.html" method="get" class="PeerControl"> <form action="Steering.html" method="get" class="PeerControl">
<fieldset> <fieldset>
<!-- <input type="submit" name="restart" value="Restart" /> --> <input type="submit" name="restart" value="Restart" />
<input type="submit" name="shutdown" value="Shutdown" /> <input type="submit" name="shutdown" value="Shutdown" />
</fieldset> </fieldset>
</form> </form>

26
htroot/Steering.java
Unescape View File

@ -46,20 +46,24 @@
// javac -classpath .:../Classes SettingsAck_p.java // javac -classpath .:../Classes SettingsAck_p.java
// if the shell's current path is HTROOT // if the shell's current path is HTROOT
import java.io.File;
import java.io.IOException;
import de.anomic.http.httpHeader; import de.anomic.http.httpHeader;
import de.anomic.plasma.plasmaSwitchboard; import de.anomic.plasma.plasmaSwitchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
import de.anomic.server.logging.serverLog;
public class Steering { public class Steering {
public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch ss) { public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch ss) {
if (post == null || ss == null) { return new serverObjects(); } if (post == null || ss == null) { return new serverObjects(); }
plasmaSwitchboard sb = (plasmaSwitchboard) ss; final plasmaSwitchboard sb = (plasmaSwitchboard) ss;
serverObjects prop = new serverObjects(); final serverObjects prop = new serverObjects();
prop.put("info", 0);//no information submitted prop.put("info", 0); //no information submitted
if (prop == null) { return prop; } if (prop == null) { return null; }
// handle access rights // handle access rights
if (!sb.verifyAuthentication(header, false)) { if (!sb.verifyAuthentication(header, false)) {
@ -68,15 +72,23 @@ public class Steering {
} }
if (post.containsKey("shutdown")) { if (post.containsKey("shutdown")) {
ss.setConfig("restart", "false");
sb.terminate(3000); sb.terminate(3000);
prop.put("info", 3); prop.put("info", 3);
return prop; return prop;
} }
if (post.containsKey("restart")) { if (post.containsKey("restart")) {
ss.setConfig("restart", "true"); // yacy.restart erstellen (wird im startscript ausgewertet)
sb.terminate(); final File yacyRestart = new File(sb.getRootPath(), "DATA/yacy.restart");
if (!yacyRestart.exists()) {
try {
yacyRestart.createNewFile();
} catch (IOException e) {
serverLog.logConfig("SHUTDOWN", "ERROR: no restart !");
e.printStackTrace();
}
}
sb.terminate(5000);
prop.put("info", 4); prop.put("info", 4);
return prop; return prop;
} }

33
source/yacy.java
Unescape View File

@ -192,7 +192,7 @@ public final class yacy {
*/ */
private static void startup(String homePath, long startupMemFree, long startupMemTotal) { private static void startup(String homePath, long startupMemFree, long startupMemTotal) {
long startup = System.currentTimeMillis(); long startup = System.currentTimeMillis();
String restart = "false";
int oldRev=0; int oldRev=0;
int newRev=0; int newRev=0;
@ -269,9 +269,6 @@ public final class yacy {
sb.setConfig("htTemplatePath", "htroot/env/templates"); sb.setConfig("htTemplatePath", "htroot/env/templates");
sb.setConfig("parseableExt", "html,htm,txt,php,shtml,asp"); sb.setConfig("parseableExt", "html,htm,txt,php,shtml,asp");
// set default = no restart
sb.setConfig("restart", "false");
// if we are running an SVN version, we try to detect the used svn revision now ... // if we are running an SVN version, we try to detect the used svn revision now ...
final Properties buildProp = new Properties(); final Properties buildProp = new Properties();
File buildPropFile = null; File buildPropFile = null;
@ -450,8 +447,6 @@ public final class yacy {
} catch (Exception e) { } catch (Exception e) {
serverLog.logSevere("MAIN CONTROL LOOP", "PANIC: " + e.getMessage(),e); serverLog.logSevere("MAIN CONTROL LOOP", "PANIC: " + e.getMessage(),e);
} }
restart = sb.getConfig("restart", "false");
// shut down // shut down
serverLog.logConfig("SHUTDOWN", "caught termination signal"); serverLog.logConfig("SHUTDOWN", "caught termination signal");
server.terminate(false); server.terminate(false);
@ -478,31 +473,7 @@ public final class yacy {
} catch (Exception ee) { } catch (Exception ee) {
serverLog.logSevere("STARTUP", "FATAL ERROR: " + ee.getMessage(),ee); serverLog.logSevere("STARTUP", "FATAL ERROR: " + ee.getMessage(),ee);
} }
serverLog.logConfig("SHUTDOWN", "goodbye. (this is the last line)");
// restart YaCy
if (restart.equals("true")) {
serverLog.logConfig("SHUTDOWN", "RESTART...");
long count = 0;
if (Thread.activeCount() > 1) {
serverLog.logConfig("SHUTDOWN", "Wait maximally 5 minutes for " + (Thread.activeCount() - 1) + " running threads to restart YaCy");
while (Thread.activeCount() > 1 && count <= 60) { // wait 5 minutes
count++;
try { Thread.sleep(5000); } catch (InterruptedException e) {}
}
}
if (count < 60) {
System.gc();
try { Thread.sleep(5000); } catch (InterruptedException e) {}
startupMemFree = Runtime.getRuntime().freeMemory(); // the amount of free memory in the Java Virtual Machine
startupMemTotal = Runtime.getRuntime().totalMemory(); // the total amount of memory in the Java virtual machine; may vary over time
startup(homePath, startupMemFree, startupMemTotal);
} else {
serverLog.logConfig("SHUTDOWN", "RESTART BREAK, more than 5 minutes waited to try a restart, goodbye. (this is the last line)");
// serverLog.logConfig("SHUTDOWN", "RESTART BREAK, getAllStackTraces()\n" + Thread.getAllStackTraces()); // needs java 1.5
}
} else {
serverLog.logConfig("SHUTDOWN", "goodbye. (this is the last line)");
}
try { try {
System.exit(0); System.exit(0);
} catch (Exception e) {} // was once stopped by de.anomic.net.ftpc$sm.checkExit(ftpc.java:1790) } catch (Exception e) {} // was once stopped by de.anomic.net.ftpc$sm.checkExit(ftpc.java:1790)

37
startYACY.bat
Unescape View File

@ -22,33 +22,38 @@ Echo Generated classpath:%CLASSPATH%
Echo JRE Parameters:%javacmd% Echo JRE Parameters:%javacmd%
Echo Priority:%priority% Echo Priority:%priority%
Echo ****************** YaCy Web Crawler/Indexer ^& Search Engine ******************* Echo ****************** YaCy Web Crawler/Indexer ^& Search Engine *******************
Echo **** (C) by Michael Peter Christen, usage granted under the GPL Version 2 **** Echo **** (C) by Michael Peter Christen, usage granted under the GPL Version 2 ****
Echo **** USE AT YOUR OWN RISK! Project home and releases: http://yacy.net/yacy **** Echo **** USE AT YOUR OWN RISK! Project home and releases: http://yacy.net/yacy ****
Echo ** LOG of YaCy: DATA/LOG/yacy00.log (and yacy^<xx^>.log) ** Echo ** LOG of YaCy: DATA/LOG/yacy00.log (and yacy^<xx^>.log) **
Echo ** STOP YaCy: execute stopYACY.bat and wait some seconds ** Echo ** STOP YaCy: execute stopYACY.bat and wait some seconds **
Echo ** GET HELP for YaCy: see www.yacy-websearch.net/wiki and www.yacy-forum.de ** Echo ** GET HELP for YaCy: see www.yacy-websearch.net/wiki and www.yacy-forum.de **
Echo ******************************************************************************* Echo *******************************************************************************
Echo ^>^> YaCy started as daemon process. Administration at http://localhost:%port% ^<^< Echo ^>^> YaCy started as daemon process. Administration at http://localhost:%port% ^<^<
start "YaCy" %priority% java %javacmd% -classpath %CLASSPATH% yacy start "YaCy" %priority% /B /WAIT java %javacmd% -classpath %CLASSPATH% yacy
GoTo :END if not exist DATA\yacy.restart GoTo :END
:WAIT
echo Please wait...
if exist DATA\yacy.running GoTo :WAIT
del DATA\yacy.restart
GoTo :STARTJAVA
Rem This target is used to read java runtime parameters out of the yacy config file Rem This target is used to read java runtime parameters out of the yacy config file
:GETSTARTOPTS :GETSTARTOPTS
for /F "tokens=1,2 delims==" %%i in (DATA\SETTINGS\httpProxy.conf) do ( for /F "tokens=1,2 delims==" %%i in (DATA\SETTINGS\httpProxy.conf) do (
if "%%i"=="javastart_Xmx" set jmx=%%j if "%%i"=="javastart_Xmx" set jmx=%%j
if "%%i"=="javastart_Xms" set jms=%%j if "%%i"=="javastart_Xms" set jms=%%j
if "%%i"=="port" set port=%%j if "%%i"=="port" set port=%%j
if "%%i"=="javastart_priority" set priolvl=%%j if "%%i"=="javastart_priority" set priolvl=%%j
) )
if defined jmx set javacmd=-%jmx% if defined jmx set javacmd=-%jmx%
if defined jms set javacmd=-%jms% %javacmd% if defined jms set javacmd=-%jms% %javacmd%
if not defined port set port=8080 if not defined port set port=8080
if defined priolvl ( if defined priolvl (
if %priolvl% == 20 set priority=/LOW if %priolvl% == 20 set priority=/LOW
if %priolvl% == 10 set priority=/BELOWNORMAL if %priolvl% == 10 set priority=/BELOWNORMAL
) )
GoTo :STARTJAVA GoTo :STARTJAVA

Write Preview
Loading…
Cancel
Save