This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/staging by this push:
new cb3168b Refactoring platform monitor module
cb3168b is described below
commit cb3168bd68ae5a623d25a2d926f08d8d6e7ce676
Author: Dimuthu Wannipurage <dimuthu.wannipur...@datasprouts.com>
AuthorDate: Mon Nov 19 15:15:23 2018 -0500
Refactoring platform monitor module
---
.../org/apache/airavata/helix/cluster/monitoring/MainMonitor.java | 3 +++
.../helix/cluster/monitoring/{ => agents}/ApiServerMonitor.java | 5 ++++-
.../airavata/helix/cluster/monitoring/{ => agents}/DbMonitor.java | 5 ++++-
.../cluster/monitoring/{ => agents}/HelixControllerMonitor.java | 4 +++-
.../cluster/monitoring/{ => agents}/HelixParticipantMonitor.java | 5 ++++-
.../helix/cluster/monitoring/{ => agents}/ZookeeperMonitor.java | 5 ++++-
6 files changed, 22 insertions(+), 5 deletions(-)
diff --git
a/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/MainMonitor.java
b/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/MainMonitor.java
index f15ded9..c727b7e 100644
---
a/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/MainMonitor.java
+++
b/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/MainMonitor.java
@@ -1,6 +1,7 @@
package org.apache.airavata.helix.cluster.monitoring;
import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.helix.cluster.monitoring.agents.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -16,6 +17,8 @@ public class MainMonitor {
public static void main(String args[]) throws ApplicationSettingsException
{
+ logger.info("Starting platform monitor");
+
List<PlatformMonitor> platformMonitors = Arrays.asList(new
ApiServerMonitor(),
new DbMonitor(), new HelixControllerMonitor(),
new HelixParticipantMonitor(), new ZookeeperMonitor());
diff --git
a/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/ApiServerMonitor.java
b/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/agents/ApiServerMonitor.java
similarity index 84%
rename from
modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/ApiServerMonitor.java
rename to
modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/agents/ApiServerMonitor.java
index 6c50c66..6dc301b 100644
---
a/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/ApiServerMonitor.java
+++
b/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/agents/ApiServerMonitor.java
@@ -1,7 +1,10 @@
-package org.apache.airavata.helix.cluster.monitoring;
+package org.apache.airavata.helix.cluster.monitoring.agents;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ServerSettings;
+import org.apache.airavata.helix.cluster.monitoring.ErrorNotifier;
+import org.apache.airavata.helix.cluster.monitoring.PlatformMonitor;
+import org.apache.airavata.helix.cluster.monitoring.PlatformMonitorError;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/DbMonitor.java
b/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/agents/DbMonitor.java
similarity index 84%
rename from
modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/DbMonitor.java
rename to
modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/agents/DbMonitor.java
index b236be5..4d71216 100644
---
a/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/DbMonitor.java
+++
b/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/agents/DbMonitor.java
@@ -1,7 +1,10 @@
-package org.apache.airavata.helix.cluster.monitoring;
+package org.apache.airavata.helix.cluster.monitoring.agents;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ServerSettings;
+import org.apache.airavata.helix.cluster.monitoring.ErrorNotifier;
+import org.apache.airavata.helix.cluster.monitoring.PlatformMonitor;
+import org.apache.airavata.helix.cluster.monitoring.PlatformMonitorError;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/HelixControllerMonitor.java
b/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/agents/HelixControllerMonitor.java
similarity index 66%
rename from
modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/HelixControllerMonitor.java
rename to
modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/agents/HelixControllerMonitor.java
index 3f4944d..9e081b5 100644
---
a/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/HelixControllerMonitor.java
+++
b/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/agents/HelixControllerMonitor.java
@@ -1,5 +1,7 @@
-package org.apache.airavata.helix.cluster.monitoring;
+package org.apache.airavata.helix.cluster.monitoring.agents;
+import org.apache.airavata.helix.cluster.monitoring.ErrorNotifier;
+import org.apache.airavata.helix.cluster.monitoring.PlatformMonitor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/HelixParticipantMonitor.java
b/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/agents/HelixParticipantMonitor.java
similarity index 94%
rename from
modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/HelixParticipantMonitor.java
rename to
modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/agents/HelixParticipantMonitor.java
index 97f02df..ad2989e 100644
---
a/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/HelixParticipantMonitor.java
+++
b/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/agents/HelixParticipantMonitor.java
@@ -1,7 +1,10 @@
-package org.apache.airavata.helix.cluster.monitoring;
+package org.apache.airavata.helix.cluster.monitoring.agents;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ServerSettings;
+import org.apache.airavata.helix.cluster.monitoring.ErrorNotifier;
+import org.apache.airavata.helix.cluster.monitoring.PlatformMonitor;
+import org.apache.airavata.helix.cluster.monitoring.PlatformMonitorError;
import org.apache.airavata.helix.impl.task.mock.MockTask;
import org.apache.airavata.helix.workflow.WorkflowOperator;
import org.apache.helix.manager.zk.ZKHelixAdmin;
diff --git
a/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/ZookeeperMonitor.java
b/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/agents/ZookeeperMonitor.java
similarity index 83%
rename from
modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/ZookeeperMonitor.java
rename to
modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/agents/ZookeeperMonitor.java
index 4a70018..c21ec90 100644
---
a/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/ZookeeperMonitor.java
+++
b/modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/agents/ZookeeperMonitor.java
@@ -1,7 +1,10 @@
-package org.apache.airavata.helix.cluster.monitoring;
+package org.apache.airavata.helix.cluster.monitoring.agents;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ServerSettings;
+import org.apache.airavata.helix.cluster.monitoring.ErrorNotifier;
+import org.apache.airavata.helix.cluster.monitoring.PlatformMonitor;
+import org.apache.airavata.helix.cluster.monitoring.PlatformMonitorError;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
