Changeset 23983

Show
Ignore:
Timestamp:
03.05.2011 21:39:33 (9 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/gs2-server.sh

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