From aace38a38b13accfb18a875a7a72e1caad786e3e Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Thu, 26 Jan 2017 15:46:14 +0000
Subject: [PATCH] Updated Monitor Interface

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/data-miner-manager-cl@141825 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/changelog.xml                          |  3 +
 pom.xml                                       |  2 +-
 .../server/monitor/DMMonitor.java             | 72 +++++++++++++++----
 3 files changed, 63 insertions(+), 14 deletions(-)

diff --git a/distro/changelog.xml b/distro/changelog.xml
index 8a05d02..1c3db08 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,7 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.data.analysis.data-miner-manager-cl.1-1-0">
+		<Change>Updated Monitor interface</Change>
+	</Changeset>
 	<Changeset component="org.gcube.data.analysis.data-miner-manager-cl.1-0-0">
 		<Change>first release</Change>
 	</Changeset>
diff --git a/pom.xml b/pom.xml
index beb0688..37f40d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>data-miner-manager-cl</groupId>
 	<artifactId>data-miner-manager-cl</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 
 	<name>data-miner-manager-cl</name>
 	<description>DataMiner Manager Client Library</description>
diff --git a/src/main/java/org/gcube/data/analysis/dataminermanagercl/server/monitor/DMMonitor.java b/src/main/java/org/gcube/data/analysis/dataminermanagercl/server/monitor/DMMonitor.java
index 6d3bfae..0090975 100644
--- a/src/main/java/org/gcube/data/analysis/dataminermanagercl/server/monitor/DMMonitor.java
+++ b/src/main/java/org/gcube/data/analysis/dataminermanagercl/server/monitor/DMMonitor.java
@@ -18,9 +18,9 @@ import org.slf4j.LoggerFactory;
  */
 public class DMMonitor {
 	private static Logger logger = LoggerFactory.getLogger(DMMonitor.class);
-	private static final int SLEEP = 1000;
-	private static final int DELAY = 2000;
-	private static final int PERIOD = 1000;
+	private int sleep = 2000; // Sleep duration
+	private int delay = 2000; // Delay on first check
+	private int period = 2000;// Interval between monitoring requests
 	private ComputationId computationId;
 	private SClient sClient;
 	private ArrayList<DMMonitorListener> listeners = new ArrayList<DMMonitorListener>();
@@ -45,18 +45,18 @@ public class DMMonitor {
 	public void start() {
 		try {
 			logger.debug("Start Monitoring");
-			notEnd=true;
+			notEnd = true;
 			timer = new Timer(false);
-			DMMonitorTask dmMonitorTask = new DMMonitorTask(this, computationId,
-					sClient, listeners);
+			DMMonitorTask dmMonitorTask = new DMMonitorTask(this,
+					computationId, sClient, listeners);
 			logger.debug("Start: " + new Date());
-			timer.schedule(dmMonitorTask, DELAY, PERIOD);
-	
-			while (notEnd){
-				Thread.sleep(SLEEP);
+			timer.schedule(dmMonitorTask, delay, period);
+
+			while (notEnd) {
+				Thread.sleep(sleep);
 			}
 			logger.debug("End run");
-			
+
 		} catch (Throwable e) {
 			logger.error(e.getLocalizedMessage());
 			e.printStackTrace();
@@ -67,10 +67,56 @@ public class DMMonitor {
 	public void cancel() {
 		if (timer != null)
 			timer.cancel();
-		notEnd=false;
-		
+		notEnd = false;
+
 	}
 
+	/**
+	 * 
+	 * @return Sleep duration
+	 */
+	public int getSleep() {
+		return sleep;
+	}
+
+	/**
+	 * 
+	 * @param sleep Sleep duration
+	 */
+	public void setSleep(int sleep) {
+		this.sleep = sleep;
+	}
 	
+	/**
+	 * 
+	 * @return Delay on first check
+	 */
+	public int getDelay() {
+		return delay;
+	}
+	
+	/**
+	 * 
+	 * @param delay Delay on first check
+	 */
+	public void setDelay(int delay) {
+		this.delay = delay;
+	}
+
+	/**
+	 * 
+	 * @return Interval between monitoring requests
+	 */
+	public int getPeriod() {
+		return period;
+	}
+	
+	/**
+	 * 
+	 * @param period Interval between monitoring requests
+	 */
+	public void setPeriod(int period) {
+		this.period = period;
+	}
 
 }