- fixed http://www.yacy-forum.de/viewtopic.php?p=29488

- some HTML-stuff

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3153 6c8d7289-2bf4-0310-a012-ef5d649a1542

1 files changed, 17 insertions, 3 deletions

diff --git a/startYACY.sh b/startYACY.sh
index 281d05ed1..f23846f78 100755
--- a/startYACY.sh
+++ b/startYACY.sh
@@ -67,11 +67,25 @@ done
 java_args=""
 if [ -f DATA/SETTINGS/httpProxy.conf ]
 then
-	for i in `grep javastart DATA/SETTINGS/httpProxy.conf`;do 
-		i="${i#javastart_*=}";
-		JAVA_ARGS="-$i $JAVA_ARGS";
+	# startup memory
+	for i in Xmx Xms; do
+		j=`grep javastart_$i DATA/SETTINGS/httpProxy.conf`;
+		j="${j#javastart_$i=}";
+		if [ -n $j ]; then JAVA_ARGS="-$j $JAVA_ARGS"; fi;
 	done
+	
+	# Priority
+	j=`grep javastart_priority DATA/SETTINGS/httpProxy.conf`;
+	j="${j#javastart_priority=}"
+	if [ -n $j ]; then JAVA="nice -n $j $JAVA"; fi;
+	
+#	for i in `grep javastart DATA/SETTINGS/httpProxy.conf`;do
+#		i="${i#javastart_*=}";
+#		JAVA_ARGS="-$i $JAVA_ARGS";
+#	done
 fi
+echo "JAVA_ARGS: $JAVA_ARGS"
+echo "JAVA: $JAVA"
 
 # generating the proper classpath
 CLASSPATH=""