Changeset 23983 for main/trunk/greenstone2/gs2-server.sh

Timestamp:

2011-05-03T21:39:33+12:00 (13 years ago)

Author:

ak19

Message:

Moved the call to gsicontrol.sh reset-gsdlhome from server.jar to gs2-server.sh since in server.jar, the log4j.properties need to be initialised in the server's constructor. Doing the reset-gsdlhome in gs2-server.sh achieves the same end-goal without this problem: on starting the server interface, reset-gsdlhome is always invoked to ensure that it will run from the current gs2-install directory.

File:

• main/trunk/greenstone2/gs2-server.sh (modified) (1 diff)

main/trunk/greenstone2/gs2-server.sh

@@ -153 +153 @@
     fi
 
+    # whenever the server is started up, make sure gsdlhome is correct (in case the install was moved).
+    # Need to redirect both stderr and stdout (with &>) into the void, since reset-gsdlhome makes 
+    # web-stop-tested output an "error" as there's no httpd.conf.in at the stage when web-stop is called.
+    # http://linuxwave.blogspot.com/2008/03/redirecting-stdout-and-stderr.html
+    ./gsicontrol.sh reset-gsdlhome &>/dev/null
 
     if [ "x$silent" == "x" -o "x$silent" != "xtrue" ]; then