Repository: airavata Updated Branches: refs/heads/master 1be29cb1f -> 55aa6dfa0
Moved airavata.log file to $AIRAVATA_HOME/logs directory and redirect stdout and stderr to /dev/null in daemon mode instead of airavata-server.out Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c7fb7282 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c7fb7282 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c7fb7282 Branch: refs/heads/master Commit: c7fb7282eeb916064f31f4d6852702f91d1e4a45 Parents: d8761f0 Author: Shameera Rathanyaka <[email protected]> Authored: Mon Aug 31 18:07:44 2015 -0400 Committer: Shameera Rathanyaka <[email protected]> Committed: Mon Aug 31 18:07:44 2015 -0400 ---------------------------------------------------------------------- distribution/src/main/assembly/bin-assembly.xml | 9 +++++++++ distribution/src/main/resources/bin/airavata-server.sh | 2 +- distribution/src/main/resources/bin/api-server.sh | 2 +- distribution/src/main/resources/bin/gfac-server.sh | 2 +- distribution/src/main/resources/bin/orchestrator-server.sh | 2 +- distribution/src/main/resources/bin/workflow-server.sh | 2 +- .../server/src/main/resources/log4j.properties | 2 +- 7 files changed, 15 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/c7fb7282/distribution/src/main/assembly/bin-assembly.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/assembly/bin-assembly.xml b/distribution/src/main/assembly/bin-assembly.xml index 49aa87c..2116783 100644 --- a/distribution/src/main/assembly/bin-assembly.xml +++ b/distribution/src/main/assembly/bin-assembly.xml @@ -110,6 +110,15 @@ </includes> </fileSet> + <!-- Create logs directory --> + <fileSet> + <directory>./</directory> + <outputDirectory>logs</outputDirectory> + <excludes> + <exclude>*/**</exclude> + </excludes> + </fileSet> + <!-- ********************** Copy samples ********************** --> <fileSet> <directory>${project.build.directory}/samples/applications http://git-wip-us.apache.org/repos/asf/airavata/blob/c7fb7282/distribution/src/main/resources/bin/airavata-server.sh ---------------------------------------------------------------------- diff --git a/distribution/src/main/resources/bin/airavata-server.sh b/distribution/src/main/resources/bin/airavata-server.sh index 885dcd4..aa37207 100755 --- a/distribution/src/main/resources/bin/airavata-server.sh +++ b/distribution/src/main/resources/bin/airavata-server.sh @@ -108,7 +108,7 @@ else echo "Starting airavata server in daemon mode..." nohup java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \ -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \ - org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > airavata-server.out & + org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > /dev/null 2>&1 & else java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \ -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \ http://git-wip-us.apache.org/repos/asf/airavata/blob/c7fb7282/distribution/src/main/resources/bin/api-server.sh ---------------------------------------------------------------------- diff --git a/distribution/src/main/resources/bin/api-server.sh b/distribution/src/main/resources/bin/api-server.sh index 872c854..403a76f 100755 --- a/distribution/src/main/resources/bin/api-server.sh +++ b/distribution/src/main/resources/bin/api-server.sh @@ -108,7 +108,7 @@ else echo "Starting airavata server in daemon mode..." nohup java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \ -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \ - org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > api-server.out & + org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > /dev/null 2>&1 & else java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \ -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \ http://git-wip-us.apache.org/repos/asf/airavata/blob/c7fb7282/distribution/src/main/resources/bin/gfac-server.sh ---------------------------------------------------------------------- diff --git a/distribution/src/main/resources/bin/gfac-server.sh b/distribution/src/main/resources/bin/gfac-server.sh index 839ef4e..47382f8 100755 --- a/distribution/src/main/resources/bin/gfac-server.sh +++ b/distribution/src/main/resources/bin/gfac-server.sh @@ -108,7 +108,7 @@ else echo "Starting airavata server in daemon mode..." nohup java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \ -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \ - org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > gfac-server.out & + org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > /dev/null 2>&1 & else java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \ -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \ http://git-wip-us.apache.org/repos/asf/airavata/blob/c7fb7282/distribution/src/main/resources/bin/orchestrator-server.sh ---------------------------------------------------------------------- diff --git a/distribution/src/main/resources/bin/orchestrator-server.sh b/distribution/src/main/resources/bin/orchestrator-server.sh index 5fa73e7..bed5f18 100755 --- a/distribution/src/main/resources/bin/orchestrator-server.sh +++ b/distribution/src/main/resources/bin/orchestrator-server.sh @@ -108,7 +108,7 @@ else echo "Starting airavata server in daemon mode..." nohup java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \ -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \ - org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > orchestrator-server.out & + org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > /dev/null 2>&1 & else java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \ -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \ http://git-wip-us.apache.org/repos/asf/airavata/blob/c7fb7282/distribution/src/main/resources/bin/workflow-server.sh ---------------------------------------------------------------------- diff --git a/distribution/src/main/resources/bin/workflow-server.sh b/distribution/src/main/resources/bin/workflow-server.sh index b66e192..5cf7ad1 100755 --- a/distribution/src/main/resources/bin/workflow-server.sh +++ b/distribution/src/main/resources/bin/workflow-server.sh @@ -108,7 +108,7 @@ else echo "Starting airavata server in daemon mode..." nohup java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \ -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \ - org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > workflow-server.out & + org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > /dev/null 2>&1 & else java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \ -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \ http://git-wip-us.apache.org/repos/asf/airavata/blob/c7fb7282/modules/configuration/server/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/modules/configuration/server/src/main/resources/log4j.properties b/modules/configuration/server/src/main/resources/log4j.properties index 07aa93a..ca7f0b3 100644 --- a/modules/configuration/server/src/main/resources/log4j.properties +++ b/modules/configuration/server/src/main/resources/log4j.properties @@ -37,7 +37,7 @@ log4j.appender.CONSOLE.layout.ConversionPattern=[%p] %m%n # LOGFILE is set to be a File appender using a PatternLayout. log4j.appender.LOGFILE=org.apache.log4j.DailyRollingFileAppender -log4j.appender.LOGFILE.File=airavata.log +log4j.appender.LOGFILE.File=../logs/airavata.log #Rollover at midnight each day. log4j.appender.LOGFILE.DatePattern='.'yyyy-MM-dd log4j.appender.LOGFILE.Append=true
