airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject airavata git commit: Use class name without package
Date Wed, 05 Oct 2016 07:36:18 GMT
Repository: airavata
Updated Branches:
  refs/heads/lahiru/AIRAVATA-2107 573f15379 -> e0ed9e573


Use class name without package


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

Branch: refs/heads/lahiru/AIRAVATA-2107
Commit: e0ed9e573ef0efad26c8a0175e083886e1118e25
Parents: 573f153
Author: Lahiru Ginnaliya Gamathige <lahiru@apache.org>
Authored: Wed Oct 5 00:36:07 2016 -0700
Committer: Lahiru Ginnaliya Gamathige <lahiru@apache.org>
Committed: Wed Oct 5 00:36:07 2016 -0700

----------------------------------------------------------------------
 .../api/server/handler/AiravataServerHandler.java     |  6 +++---
 .../apache/airavata/gfac/impl/HPCRemoteCluster.java   | 14 +++++++-------
 .../gfac/monitor/email/EmailBasedMonitor.java         | 10 +++++-----
 .../airavata/gfac/server/GfacServerHandler.java       |  6 +++---
 .../server/OrchestratorServerHandler.java             | 14 +++++++-------
 5 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/e0ed9e57/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index fe076ee..ba48fce 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -93,9 +93,9 @@ public class AiravataServerHandler implements Airavata.Iface {
     private Publisher statusPublisher;
     private Publisher experimentPublisher;
     private CredentialStoreService.Client csClient;
-    private MinMaxCounter experimentPublishCount = Kamon.metrics().minMaxCounter(String.format("%s.experiment.publish-count",
getClass().getName()));
-    private MinMaxCounter experimentLaunchPublishCount = Kamon.metrics().minMaxCounter(String.format("%s.experiment_launch.publish-count",
getClass().getName()));
-    private MinMaxCounter experimentCancelPublishCount = Kamon.metrics().minMaxCounter(String.format("%s.experiment_cancel.publish-count",
getClass().getName()));
+    private MinMaxCounter experimentPublishCount = Kamon.metrics().minMaxCounter(String.format("%s.experiment.publish-count",
getClass().getSimpleName()));
+    private MinMaxCounter experimentLaunchPublishCount = Kamon.metrics().minMaxCounter(String.format("%s.experiment_launch.publish-count",
getClass().getSimpleName()));
+    private MinMaxCounter experimentCancelPublishCount = Kamon.metrics().minMaxCounter(String.format("%s.experiment_cancel.publish-count",
getClass().getSimpleName()));
 
     public AiravataServerHandler() {
         try {

http://git-wip-us.apache.org/repos/asf/airavata/blob/e0ed9e57/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java
b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java
index cc320a1..4ce4336 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java
@@ -53,13 +53,13 @@ public class HPCRemoteCluster extends AbstractRemoteCluster{
 	private final SSHKeyAuthentication authentication;
 	private final JSch jSch;
 	private Session session;
-	private MinMaxCounter submittedJobCount = Kamon.metrics().minMaxCounter(String.format("%s.submitted-jobs",
getClass().getName()));
-	private MinMaxCounter nonZeroExitCodeJobCount = Kamon.metrics().minMaxCounter(String.format("%s.nonzero-exit-jobs",
getClass().getName()));
-	private MinMaxCounter emptyJobIdCount = Kamon.metrics().minMaxCounter(String.format("%s.empty-jobid-jobs",
getClass().getName()));
-	private MinMaxCounter copyToFailCount = Kamon.metrics().minMaxCounter(String.format("%s.copyTo-fail",
getClass().getName()));
-	private MinMaxCounter copyFromFailCount = Kamon.metrics().minMaxCounter(String.format("%s.copyFrom-fail",
getClass().getName()));
-	private MinMaxCounter mkDirFailCount = Kamon.metrics().minMaxCounter(String.format("%s.mkDir-fail",
getClass().getName()));
-	private MinMaxCounter listFailCount = Kamon.metrics().minMaxCounter(String.format("%s.list-fail",
getClass().getName()));
+	private MinMaxCounter submittedJobCount = Kamon.metrics().minMaxCounter(String.format("%s.submitted-jobs",
getClass().getSimpleName()));
+	private MinMaxCounter nonZeroExitCodeJobCount = Kamon.metrics().minMaxCounter(String.format("%s.nonzero-exit-jobs",
getClass().getSimpleName()));
+	private MinMaxCounter emptyJobIdCount = Kamon.metrics().minMaxCounter(String.format("%s.empty-jobid-jobs",
getClass().getSimpleName()));
+	private MinMaxCounter copyToFailCount = Kamon.metrics().minMaxCounter(String.format("%s.copyTo-fail",
getClass().getSimpleName()));
+	private MinMaxCounter copyFromFailCount = Kamon.metrics().minMaxCounter(String.format("%s.copyFrom-fail",
getClass().getSimpleName()));
+	private MinMaxCounter mkDirFailCount = Kamon.metrics().minMaxCounter(String.format("%s.mkDir-fail",
getClass().getSimpleName()));
+	private MinMaxCounter listFailCount = Kamon.metrics().minMaxCounter(String.format("%s.list-fail",
getClass().getSimpleName()));
 
 
 	public HPCRemoteCluster(ServerInfo serverInfo, JobManagerConfiguration jobManagerConfiguration,
AuthenticationInfo

http://git-wip-us.apache.org/repos/asf/airavata/blob/e0ed9e57/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
index 8b9d2ea..dce6032 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
@@ -75,11 +75,11 @@ public class EmailBasedMonitor implements JobMonitor, Runnable{
 	private Message[] flushUnseenMessages;
     private Map<String, Boolean> canceledJobs = new ConcurrentHashMap<>();
     private Timer timer;
-    private MinMaxCounter monitorQueueSize = Kamon.metrics().minMaxCounter(String.format("%s.monitor-queue-size",
getClass().getName()));
-    private MinMaxCounter cancelledJobs = Kamon.metrics().minMaxCounter(String.format("%s.cancelled-jobs",
getClass().getName()));
-    private MinMaxCounter completedJobCount = Kamon.metrics().minMaxCounter(String.format("%s.completed-jobs",
getClass().getName()));
-    private MinMaxCounter failedJobCount = Kamon.metrics().minMaxCounter(String.format("%s.failed-jobs",
getClass().getName()));
-    private Histogram receivedEmailCount = Kamon.metrics().histogram(String.format("%s.received-emails",
getClass().getName()));
+    private MinMaxCounter monitorQueueSize = Kamon.metrics().minMaxCounter(String.format("%s.monitor-queue-size",
getClass().getSimpleName()));
+    private MinMaxCounter cancelledJobs = Kamon.metrics().minMaxCounter(String.format("%s.cancelled-jobs",
getClass().getSimpleName()));
+    private MinMaxCounter completedJobCount = Kamon.metrics().minMaxCounter(String.format("%s.completed-jobs",
getClass().getSimpleName()));
+    private MinMaxCounter failedJobCount = Kamon.metrics().minMaxCounter(String.format("%s.failed-jobs",
getClass().getSimpleName()));
+    private Histogram receivedEmailCount = Kamon.metrics().histogram(String.format("%s.received-emails",
getClass().getSimpleName()));
 
     private ExecutorService cachedThreadPool;
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/e0ed9e57/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
index 4009c24..3814c02 100644
--- a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
+++ b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
@@ -91,9 +91,9 @@ public class GfacServerHandler implements GfacService.Iface {
     private BlockingQueue<TaskSubmitEvent> taskSubmitEvents;
     private static List<AbstractActivityListener> activityListeners = new ArrayList<AbstractActivityListener>();
     private ExecutorService executorService;
-    private MinMaxCounter consumedCount = Kamon.metrics().minMaxCounter(String.format("%s.consumed-count",
getClass().getName()));
-    private Histogram threadPoolQueueSize = Kamon.metrics().histogram(String.format("%s.queue-size",
getClass().getName()));
-    private Histogram threadPoolActiveThreads = Kamon.metrics().histogram(String.format("%s.active-threads",
getClass().getName()));
+    private MinMaxCounter consumedCount = Kamon.metrics().minMaxCounter(String.format("%s.consumed-count",
getClass().getSimpleName()));
+    private Histogram threadPoolQueueSize = Kamon.metrics().histogram(String.format("%s.queue-size",
getClass().getSimpleName()));
+    private Histogram threadPoolActiveThreads = Kamon.metrics().histogram(String.format("%s.active-threads",
getClass().getSimpleName()));
 
 
     public GfacServerHandler() throws AiravataStartupException {

http://git-wip-us.apache.org/repos/asf/airavata/blob/e0ed9e57/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
index bde61c9..fce0d9d 100644
--- a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
+++ b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
@@ -88,13 +88,13 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface
{
 	private final Subscriber statusSubscribe;
 	private final Subscriber experimentSubscriber;
 	private CuratorFramework curatorClient;
-    private MinMaxCounter publishCount = Kamon.metrics().minMaxCounter(String.format("%s.publish-count",
getClass().getName()));
-    private MinMaxCounter publishFail = Kamon.metrics().minMaxCounter(String.format("%s.publish-fail-count",
getClass().getName()));
-    private MinMaxCounter processConsumeCount = Kamon.metrics().minMaxCounter(String.format("%s.process.consume-count",
getClass().getName()));
-    private MinMaxCounter experimentConsumeCount = Kamon.metrics().minMaxCounter(String.format("%s.experiment.consume-count",
getClass().getName()));
-	private MinMaxCounter experimentLaunchConsumeCount = Kamon.metrics().minMaxCounter(String.format("%s.experiment_launch.consume-count",
getClass().getName()));
-	private MinMaxCounter experimentCancelConsumeCount = Kamon.metrics().minMaxCounter(String.format("%s.experiment_cancel.consume-count",
getClass().getName()));
-	private MinMaxCounter unsupportedMessageCount = Kamon.metrics().minMaxCounter(String.format("%s.unsupported-count",
getClass().getName()));
+    private MinMaxCounter publishCount = Kamon.metrics().minMaxCounter(String.format("%s.publish-count",
getClass().getSimpleName()));
+    private MinMaxCounter publishFail = Kamon.metrics().minMaxCounter(String.format("%s.publish-fail-count",
getClass().getSimpleName()));
+    private MinMaxCounter processConsumeCount = Kamon.metrics().minMaxCounter(String.format("%s.process.consume-count",
getClass().getSimpleName()));
+    private MinMaxCounter experimentConsumeCount = Kamon.metrics().minMaxCounter(String.format("%s.experiment.consume-count",
getClass().getSimpleName()));
+	private MinMaxCounter experimentLaunchConsumeCount = Kamon.metrics().minMaxCounter(String.format("%s.experiment_launch.consume-count",
getClass().getSimpleName()));
+	private MinMaxCounter experimentCancelConsumeCount = Kamon.metrics().minMaxCounter(String.format("%s.experiment_cancel.consume-count",
getClass().getSimpleName()));
+	private MinMaxCounter unsupportedMessageCount = Kamon.metrics().minMaxCounter(String.format("%s.unsupported-count",
getClass().getSimpleName()));
 	private ExecutorService cachedThreadPool;
 
 	/**


Mime
View raw message