subject:"airavata git commit\: fixing logging issue"

[35/51] [abbrv] airavata git commit: fixing logging issue

2016-10-16 Thread scnakandala

fixing logging issue


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/eb62af94
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/eb62af94
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/eb62af94

Branch: refs/heads/airavata-gov-registry
Commit: eb62af94250c690c933b2f8d15fe620de23aa36f
Parents: 6efb535
Author: scnakandala 
Authored: Thu Oct 13 19:03:38 2016 -0400
Committer: scnakandala 
Committed: Thu Oct 13 19:03:38 2016 -0400

--
 .../src/main/assembly/bin-assembly.xml  |  1 +
 .../src/main/resources/bin/sharing-registry.sh  |  8 +-
 .../sharing/registry/server/ServerMain.java | 98 
 .../registry/server/SharingRegistryServer.java  |  8 --
 4 files changed, 103 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/eb62af94/modules/sharing-registry/sharing-registry-distribution/src/main/assembly/bin-assembly.xml
--
diff --git 
a/modules/sharing-registry/sharing-registry-distribution/src/main/assembly/bin-assembly.xml
 
b/modules/sharing-registry/sharing-registry-distribution/src/main/assembly/bin-assembly.xml
index b8fdfd4..cef9a11 100644
--- 
a/modules/sharing-registry/sharing-registry-distribution/src/main/assembly/bin-assembly.xml
+++ 
b/modules/sharing-registry/sharing-registry-distribution/src/main/assembly/bin-assembly.xml
@@ -43,6 +43,7 @@
 bin
 
 airavata-server.properties
+log4j.properties
 
 
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/eb62af94/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
--
diff --git 
a/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
 
b/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
index 44aef1f..02be943 100644
--- 
a/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
+++ 
b/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
@@ -62,10 +62,10 @@ done
 
 if $STOP;
 then
-   for f in `find . -name "*-start_*"`; do
+   for f in `find . -name "server_start_*"`; do
IFS='_' read -a f_split <<< "$f"
echo "Found process file : $f"
-   echo -n "Sending kill signals to process ${f_split[1]}..."
+   echo -n "Sending kill signals to process ${f_split[2]}..."
out=`kill -9 ${f_split[1]} 2>&1`
if [ -z "$out" ]; then
echo "done"
@@ -83,8 +83,8 @@ then
 else
if $IS_DAEMON_MODE ; then
echo "Starting Sharing Registry Server in daemon mode..."
-   nohup $JAVA_HOME/bin/java ${JAVA_OPTS} -classpath 
"$SHARING_REGISTRY_CLASSPATH"  
org.apache.airavata.sharing.registry.server.SharingRegistryServer > 
../sharing-registry.out & echo $! > "../sharing-registry-start_$!"
+   $JAVA_HOME/bin/java ${JAVA_OPTS} -classpath 
"$SHARING_REGISTRY_CLASSPATH"  
org.apache.airavata.sharing.registry.server.ServerMain $* > /dev/null 2>&1 &
else
-   $JAVA_HOME/bin/java ${JAVA_OPTS} -classpath 
"$SHARING_REGISTRY_CLASSPATH"  
org.apache.airavata.sharing.registry.server.SharingRegistryServer
+   $JAVA_HOME/bin/java ${JAVA_OPTS} -classpath 
"$SHARING_REGISTRY_CLASSPATH"  
org.apache.airavata.sharing.registry.server.ServerMain $*
fi
 fi
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/eb62af94/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/ServerMain.java
--
diff --git 
a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/ServerMain.java
 
b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/ServerMain.java
new file mode 100644
index 000..54e1722
--- /dev/null
+++ 
b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/ServerMain.java
@@ -0,0 +1,98 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may

airavata git commit: fixing logging issue

2016-10-13 Thread scnakandala

Repository: airavata
Updated Branches:
  refs/heads/develop 6efb535b0 -> eb62af942


fixing logging issue


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/eb62af94
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/eb62af94
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/eb62af94

Branch: refs/heads/develop
Commit: eb62af94250c690c933b2f8d15fe620de23aa36f
Parents: 6efb535
Author: scnakandala 
Authored: Thu Oct 13 19:03:38 2016 -0400
Committer: scnakandala 
Committed: Thu Oct 13 19:03:38 2016 -0400

--
 .../src/main/assembly/bin-assembly.xml  |  1 +
 .../src/main/resources/bin/sharing-registry.sh  |  8 +-
 .../sharing/registry/server/ServerMain.java | 98 
 .../registry/server/SharingRegistryServer.java  |  8 --
 4 files changed, 103 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/eb62af94/modules/sharing-registry/sharing-registry-distribution/src/main/assembly/bin-assembly.xml
--
diff --git 
a/modules/sharing-registry/sharing-registry-distribution/src/main/assembly/bin-assembly.xml
 
b/modules/sharing-registry/sharing-registry-distribution/src/main/assembly/bin-assembly.xml
index b8fdfd4..cef9a11 100644
--- 
a/modules/sharing-registry/sharing-registry-distribution/src/main/assembly/bin-assembly.xml
+++ 
b/modules/sharing-registry/sharing-registry-distribution/src/main/assembly/bin-assembly.xml
@@ -43,6 +43,7 @@
 bin
 
 airavata-server.properties
+log4j.properties
 
 
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/eb62af94/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
--
diff --git 
a/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
 
b/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
index 44aef1f..02be943 100644
--- 
a/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
+++ 
b/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
@@ -62,10 +62,10 @@ done
 
 if $STOP;
 then
-   for f in `find . -name "*-start_*"`; do
+   for f in `find . -name "server_start_*"`; do
IFS='_' read -a f_split <<< "$f"
echo "Found process file : $f"
-   echo -n "Sending kill signals to process ${f_split[1]}..."
+   echo -n "Sending kill signals to process ${f_split[2]}..."
out=`kill -9 ${f_split[1]} 2>&1`
if [ -z "$out" ]; then
echo "done"
@@ -83,8 +83,8 @@ then
 else
if $IS_DAEMON_MODE ; then
echo "Starting Sharing Registry Server in daemon mode..."
-   nohup $JAVA_HOME/bin/java ${JAVA_OPTS} -classpath 
"$SHARING_REGISTRY_CLASSPATH"  
org.apache.airavata.sharing.registry.server.SharingRegistryServer > 
../sharing-registry.out & echo $! > "../sharing-registry-start_$!"
+   $JAVA_HOME/bin/java ${JAVA_OPTS} -classpath 
"$SHARING_REGISTRY_CLASSPATH"  
org.apache.airavata.sharing.registry.server.ServerMain $* > /dev/null 2>&1 &
else
-   $JAVA_HOME/bin/java ${JAVA_OPTS} -classpath 
"$SHARING_REGISTRY_CLASSPATH"  
org.apache.airavata.sharing.registry.server.SharingRegistryServer
+   $JAVA_HOME/bin/java ${JAVA_OPTS} -classpath 
"$SHARING_REGISTRY_CLASSPATH"  
org.apache.airavata.sharing.registry.server.ServerMain $*
fi
 fi
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/eb62af94/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/ServerMain.java
--
diff --git 
a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/ServerMain.java
 
b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/ServerMain.java
new file mode 100644
index 000..54e1722
--- /dev/null
+++ 
b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/ServerMain.java
@@ -0,0 +1,98 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to

[35/51] [abbrv] airavata git commit: fixing logging issue

airavata git commit: fixing logging issue

2 matches

Site Navigation

Mail list logo

Footer information