Repository: airavata Updated Branches: refs/heads/master 1263b2b04 -> 35da60257
Adding more fixes to Monitoring - AIRAVATA-1022 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/35da6025 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/35da6025 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/35da6025 Branch: refs/heads/master Commit: 35da60257e7a9e92089426f525895b359bad25af Parents: 1263b2b Author: lahiru <[email protected]> Authored: Mon Mar 10 15:44:57 2014 -0400 Committer: lahiru <[email protected]> Committed: Mon Mar 10 15:44:57 2014 -0400 ---------------------------------------------------------------------- .../airavata/job/monitor/impl/push/amqp/AMQPMonitor.java | 4 ++-- .../airavata/job/monitor/impl/push/amqp/BasicConsumer.java | 5 ++++- .../apache/airavata/job/monitor/util/AMQPConnectionUtil.java | 6 ++---- .../java/org/apache/airavata/job/monitor/util/X509Helper.java | 3 ++- pom.xml | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/35da6025/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/AMQPMonitor.java ---------------------------------------------------------------------- diff --git a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/AMQPMonitor.java b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/AMQPMonitor.java index 5548ae3..8bca73c 100644 --- a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/AMQPMonitor.java +++ b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/AMQPMonitor.java @@ -101,7 +101,7 @@ public class AMQPMonitor extends PushMonitor { // if we already have a channel we do not create one if (availableChannels.get(channelID) == null) { //todo need to fix this rather getting it from a file - Connection connection = AMQPConnectionUtil.connect(connectionName, proxyPath); + Connection connection = AMQPConnectionUtil.connect(amqpHosts,connectionName, proxyPath); Channel channel = null; try { channel = connection.createChannel(); @@ -112,7 +112,7 @@ public class AMQPMonitor extends PushMonitor { String filterString = CommonUtils.getRoutingKey(monitorID); // here we queuebind to a particular user in a particular machine channel.queueBind(queueName, "glue2.computing_activity", filterString); - System.out.println(filterString); + logger.info("Using filtering string to monitor: " + filterString); } catch (IOException e) { logger.error("Error creating the connection to finishQueue the job:" + monitorID.getJobID()); } http://git-wip-us.apache.org/repos/asf/airavata/blob/35da6025/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/BasicConsumer.java ---------------------------------------------------------------------- diff --git a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/BasicConsumer.java b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/BasicConsumer.java index 76bfa9c..f6704ca 100644 --- a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/BasicConsumer.java +++ b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/BasicConsumer.java @@ -27,8 +27,11 @@ import com.rabbitmq.client.ShutdownSignalException; import org.apache.airavata.job.monitor.MonitorID; import org.apache.airavata.job.monitor.core.MessageParser; import org.apache.airavata.job.monitor.event.MonitorPublisher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class BasicConsumer implements Consumer { + private final static Logger logger = LoggerFactory.getLogger(AMQPMonitor.class); MessageParser parser; @@ -56,7 +59,7 @@ public class BasicConsumer implements Consumer { AMQP.BasicProperties properties, byte[] body) { - System.out.println(" job update for: " + envelope.getRoutingKey()); + logger.info(" job update for: " + envelope.getRoutingKey()); String message = new String(body); message = message.replaceAll("(?m)^", " "); http://git-wip-us.apache.org/repos/asf/airavata/blob/35da6025/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/util/AMQPConnectionUtil.java ---------------------------------------------------------------------- diff --git a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/util/AMQPConnectionUtil.java b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/util/AMQPConnectionUtil.java index f100b8f..ea27f97 100644 --- a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/util/AMQPConnectionUtil.java +++ b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/util/AMQPConnectionUtil.java @@ -29,13 +29,11 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManagerFactory; import java.security.KeyStore; import java.util.Collections; +import java.util.List; import java.util.Vector; public class AMQPConnectionUtil { - public static Connection connect(String vhost, String proxyFile) { - Vector<String> hosts = new Vector<String>(); - hosts.add("info1.dyn.teragrid.org"); - hosts.add("info2.dyn.teragrid.org"); + public static Connection connect(List<String>hosts,String vhost, String proxyFile) { Collections.shuffle(hosts); for (String host : hosts) { Connection connection = connect(host, vhost, proxyFile); http://git-wip-us.apache.org/repos/asf/airavata/blob/35da6025/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/util/X509Helper.java ---------------------------------------------------------------------- diff --git a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/util/X509Helper.java b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/util/X509Helper.java index 532e3f1..da17360 100644 --- a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/util/X509Helper.java +++ b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/util/X509Helper.java @@ -20,6 +20,7 @@ */ package org.apache.airavata.job.monitor.util; +import org.apache.airavata.common.utils.ServerSettings; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.openssl.PEMReader; @@ -118,7 +119,7 @@ public class X509Helper { KeyStoreException, CertificateException, NoSuchAlgorithmException { - return trustKeyStoreFromCertDir("/Users/chathuri/dev/airavata/cert/certificates"); + return trustKeyStoreFromCertDir(ServerSettings.getProperties().getProperty("trusted.cert.location")); } public static KeyStore trustKeyStoreFromCertDir(String certDir) throws IOException, http://git-wip-us.apache.org/repos/asf/airavata/blob/35da6025/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f90c148..b2933f0 100644 --- a/pom.xml +++ b/pom.xml @@ -458,7 +458,7 @@ <!--module>samples</module--> <module>modules/server</module> <module>modules/test-suite</module> - <module>modules/distribution</module> + <!--module>modules/distribution</module--> <module>modules/integration-tests</module> <module>modules/airavata-job-monitor</module> </modules>
