Fixed a bug in the listener waiting too long to pick up files

forcedotcom · Dec 16, 2014 · 09e1e3e · 09e1e3e
1 parent 08044b2
commit 09e1e3e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<description>Analytics Cloud Datatset Utils</description>
 	<artifactId>datasetutils</artifactId>
 	<packaging>jar</packaging>
-	<version>32.0.5-SNAPSHOT</version>
+	<version>32.0.5</version>
 	<url>https://github.com/forcedotcom/Analytics-Cloud-Dataset-Utils</url>
 	<organization>
 		<name>salesforce.com</name>
@@ -37,7 +37,7 @@
 		<connection>scm:git:[email protected]:forcedotcom/Analytics-Cloud-Dataset-Utils.git</connection>
 		<developerConnection>scm:git:[email protected]:forcedotcom/Analytics-Cloud-Dataset-Utils.git</developerConnection>
 		<url>scm:git:[email protected]:forcedotcom/Analytics-Cloud-Dataset-Utils.git</url>
-		<tag>HEAD</tag>
+		<tag>datasetutils-32.0.5</tag>
 	</scm>
 	<dependencies>
 		<dependency>

diff --git a/src/main/java/com/sforce/dataset/DatasetUtilMain.java b/src/main/java/com/sforce/dataset/DatasetUtilMain.java
@@ -113,6 +113,10 @@ else if(args[i-1].equalsIgnoreCase("--action"))
 				{
 					action = args[i];
 				}
+				else if(args[i-1].equalsIgnoreCase("--debug"))
+				{
+					params.debug = true;
+				}
 				else if(args[i-1].equalsIgnoreCase("--inputFile"))
 				{
 					String tmp = args[i];
@@ -283,7 +287,7 @@ else if(args[i-1].equalsIgnoreCase("--codingErrorAction"))
 		if(params.username!=null || params.sessionId != null)
 		{
 			try {
-				partnerConnection  = DatasetUtils.login(0, params.username, params.password, params.token, params.endpoint, params.sessionId);
+				partnerConnection  = DatasetUtils.login(0, params.username, params.password, params.token, params.endpoint, params.sessionId, params.debug);
 			} catch (ConnectionException e) {
 				e.printStackTrace();
 				System.exit(-1);

diff --git a/src/main/java/com/sforce/dataset/DatasetUtilParams.java b/src/main/java/com/sforce/dataset/DatasetUtilParams.java
@@ -44,5 +44,6 @@ public class DatasetUtilParams {
 	String Operation = null;
 	int rowLimit = 0;
 	boolean useBulkAPI = false;
+	boolean debug = false;
 	CodingErrorAction codingErrorAction = CodingErrorAction.REPORT;
 }
diff --git a/src/main/java/com/sforce/dataset/loader/file/listener/FileListenerThread.java b/src/main/java/com/sforce/dataset/loader/file/listener/FileListenerThread.java
@@ -75,7 +75,7 @@ public void run() {
        while (!isDone) {
 			try
 			{
-				long cutOff = System.currentTimeMillis() - (1000*fileListener.fileAge);
+				long cutOff = System.currentTimeMillis() - (fileListener.fileAge);
 				IOFileFilter ageFilter = FileFilterUtils.ageFileFilter(cutOff);
 				IOFileFilter nameFilter = FileFilterUtils.nameFileFilter(fileListener.inputFilePattern, IOCase.INSENSITIVE);
 //				IOFileFilter suffixFileFilter1 = FileFilterUtils.suffixFileFilter(".zip", IOCase.INSENSITIVE);

diff --git a/src/main/java/com/sforce/dataset/util/DatasetUtils.java b/src/main/java/com/sforce/dataset/util/DatasetUtils.java
@@ -316,7 +316,7 @@ public static boolean downloadEM(String EM_NAME, PartnerConnection connection) t
 	}
 
 
-	public static PartnerConnection login(int retryCount,String username,String password, String token, String endpoint, String sessionId) throws ConnectionException  {
+	public static PartnerConnection login(int retryCount,String username,String password, String token, String endpoint, String sessionId, boolean debug) throws ConnectionException  {
 
 		if(sessionId==null)
 		{
@@ -357,7 +357,8 @@ public static PartnerConnection login(int retryCount,String username,String pass
 				@SuppressWarnings("unused")
 				GetUserInfoResult userInfo = connection.getUserInfo();
 				System.out.println("Service Endpoint: " + config.getServiceEndpoint());
-				System.out.println("SessionId Endpoint: " + config.getSessionId());
+				if(debug)
+					System.out.println("SessionId: " + config.getSessionId());
 //				System.out.println("User Id: " + userInfo.getUserName());
 //				System.out.println("User Email: " + userInfo.getUserEmail());
 				System.out.println();
@@ -378,7 +379,7 @@ public static PartnerConnection login(int retryCount,String username,String pass
 				} catch (InterruptedException e1) {
 					e1.printStackTrace();
 				}
-				return login(retryCount,username, password, null, endpoint, sessionId);
+				return login(retryCount,username, password, null, endpoint, sessionId, debug);
 			}
 			throw new ConnectionException(e.toString());
 		}