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

- option enableSimpleConfig can disable hidden tables

Browse Source 
- corrected some Xmx values
- friendlier welcome message format

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5259 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
lotus 17 years ago
parent ff68f394dd
commit 736dd86193
7 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File

2
defaults/yacy.init
Unescape View File

@ -814,6 +814,8 @@ svnRevision=0
currentSkin=default currentSkin=default
enableSimpleConfig=true
# temporary flag for new database structure. set only true for testing # temporary flag for new database structure. set only true for testing
# ALL DATA THAT IS CREATED WITH THIS FLAG ON WILL BE VOID IN A FINAL VERSION # ALL DATA THAT IS CREATED WITH THIS FLAG ON WILL BE VOID IN A FINAL VERSION
# table-types: RAM = 0, TREE = 1, FLEX = 2; # table-types: RAM = 0, TREE = 1, FLEX = 2;

2
htroot/PerformanceMemory_p.html
Unescape View File

@ -5,7 +5,7 @@
#%env/templates/metas.template%# #%env/templates/metas.template%#
<script type="text/javascript" src="js/html.js"></script> <script type="text/javascript" src="js/html.js"></script>
</head> </head>
<body id="PerformanceMemory" onload="hide('memory_tables')"> <body id="PerformanceMemory" #(enableSimpleConfig)#::onload="hide('memory_tables')"#(/enableSimpleConfig)#>
<script type="text/javascript"><!-- <script type="text/javascript"><!--
function reloadGraph() { function reloadGraph() {
if(document.forms["optionreloadGraph"].option.checked) if(document.forms["optionreloadGraph"].option.checked)

11
htroot/PerformanceMemory_p.java
Unescape View File

@ -53,11 +53,14 @@ public class PerformanceMemory_p {
if (defaultSettings == null) { if (defaultSettings == null) {
defaultSettings = serverFileUtils.loadHashMap(new File(env.getRootPath(), "defaults/yacy.init")); defaultSettings = serverFileUtils.loadHashMap(new File(env.getRootPath(), "defaults/yacy.init"));
} }
prop.put("enableSimpleConfig", env.getConfigBool("enableSimpleConfig", true) ? "1" : "0");
prop.put("gc", "0"); prop.put("gc", "0");
if (post != null) { if (post != null) {
int xmx = 96; // default maximum heap size int xmx = 120; // default maximum heap size
if (post.containsKey("Xmx")) { if (post.containsKey("Xmx")) {
try { xmx = Integer.valueOf(post.get("Xmx", "64")).intValue(); } catch (final NumberFormatException e){} try { xmx = Integer.valueOf(post.get("Xmx", "120")).intValue(); } catch (final NumberFormatException e){}
env.setConfig("javastart_Xmx", "Xmx" + xmx + "m"); env.setConfig("javastart_Xmx", "Xmx" + xmx + "m");
env.setConfig("javastart_Xms", "Xms" + xmx + "m"); env.setConfig("javastart_Xms", "Xms" + xmx + "m");
prop.put("setStartupCommit", "1"); prop.put("setStartupCommit", "1");
@ -211,9 +214,9 @@ public class PerformanceMemory_p {
prop.putNum("objectMissCacheTotalMem", totalmissmem / (1024 * 1024d)); prop.putNum("objectMissCacheTotalMem", totalmissmem / (1024 * 1024d));
// parse initialization memory settings // parse initialization memory settings
final String Xmx = env.getConfig("javastart_Xmx", "Xmx96m").substring(3); final String Xmx = env.getConfig("javastart_Xmx", "Xmx120m").substring(3);
prop.put("Xmx", Xmx.substring(0, Xmx.length() - 1)); prop.put("Xmx", Xmx.substring(0, Xmx.length() - 1));
final String Xms = env.getConfig("javastart_Xms", "Xms96m").substring(3); final String Xms = env.getConfig("javastart_Xms", "Xms120m").substring(3);
prop.put("Xms", Xms.substring(0, Xms.length() - 1)); prop.put("Xms", Xms.substring(0, Xms.length() - 1));
// other caching structures // other caching structures

2
htroot/PerformanceQueues_p.html
Unescape View File

@ -5,7 +5,7 @@
#%env/templates/metas.template%# #%env/templates/metas.template%#
<script type="text/javascript" src="js/html.js"></script> <script type="text/javascript" src="js/html.js"></script>
</head> </head>
<body id="PerformanceQueues" onload="hide('expert_settings')"> <body id="PerformanceQueues" #(enableSimpleConfig)#::onload="hide('expert_settings')"#(/enableSimpleConfig)#>
#%env/templates/header.template%# #%env/templates/header.template%#
#%env/templates/submenuConfig.template%# #%env/templates/submenuConfig.template%#
<h2>Performance Settings of Queues and Processes</h2> <h2>Performance Settings of Queues and Processes</h2>

2
htroot/PerformanceQueues_p.java
Unescape View File

@ -72,6 +72,8 @@ public class PerformanceQueues_p {
final boolean xml = (header.get("PATH")).endsWith(".xml"); final boolean xml = (header.get("PATH")).endsWith(".xml");
prop.setLocalized(!xml); prop.setLocalized(!xml);
prop.put("enableSimpleConfig", sb.getConfigBool("enableSimpleConfig", true) ? "1" : "0");
// calculate totals // calculate totals
long blocktime_total = 0, sleeptime_total = 0, exectime_total = 0; long blocktime_total = 0, sleeptime_total = 0, exectime_total = 0;
while (threads.hasNext()) { while (threads.hasNext()) {

2
htroot/Status.html
Unescape View File

@ -41,7 +41,7 @@
<div class="welcome"> <div class="welcome">
<center> <center>
<h2><img src="/env/grafics/kaskelix.png" align="bottom">Welcome to YaCy!</h2> <h2><img src="/env/grafics/kaskelix.png" align="middle" style="margin-right:5px;">Welcome to YaCy!</h2>
<iframe src="rssTerminal.html?set=PEERNEWS,REMOTESEARCH,LOCALSEARCH,REMOTEINDEXING,LOCALINDEXING,INDEXRECEIVE&width=600px&height=180px&maxlines=20&maxwidth=120" <iframe src="rssTerminal.html?set=PEERNEWS,REMOTESEARCH,LOCALSEARCH,REMOTEINDEXING,LOCALINDEXING,INDEXRECEIVE&width=600px&height=180px&maxlines=20&maxwidth=120"
width="600" height="180" scrolling="no" name="newsframe" width="600" height="180" scrolling="no" name="newsframe"
marginheight="0" marginwidth="0" frameborder="1"></iframe><br /> marginheight="0" marginwidth="0" frameborder="1"></iframe><br />

2
yacy.logging
Unescape View File

@ -15,7 +15,7 @@ PARSER.level = INFO
PROXY.level = INFO PROXY.level = INFO
YACY.level = INFO YACY.level = INFO
HTCACHE.level = INFO HTCACHE.level = INFO
PLASMA.level = INFO PLASMA.level = FINE
SERVER.level = INFO SERVER.level = INFO
WORDMIGRATION.level = FINE WORDMIGRATION.level = FINE
FILEHANDLER.level = INFO FILEHANDLER.level = INFO

Write Preview
Loading…
Cancel
Save