didfet %!s(int64=10) %!d(string=hai) anos
pai
achega
56b932ee2e
Modificáronse 4 ficheiros con 13 adicións e 10 borrados
  1. 2 2
      .classpath
  2. 1 1
      .project
  3. 1 1
      pom.xml
  4. 9 6
      src/main/java/info/fetter/logstashforwarder/FileWatcher.java

+ 2 - 2
.classpath

@@ -17,12 +17,12 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

+ 1 - 1
.project

@@ -17,7 +17,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>

+ 1 - 1
pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>logstash-forwarder-java</groupId>
 	<artifactId>logstash-forwarder-java</artifactId>
-	<version>0.2.0</version>
+	<version>0.2.1-SNAPSHOT</version>
 	<name>logstash-forwarder-java</name>
 	<description>Java version of logstash forwarder</description>
 	<url>https://github.com/didfet/logstash-forwarder-java</url>

+ 9 - 6
src/main/java/info/fetter/logstashforwarder/FileWatcher.java

@@ -315,18 +315,21 @@ public class FileWatcher {
 		for(File file : oldWatchMap.keySet()) {
 			FileState state = oldWatchMap.get(file);
 			if(state.isDeleted()) {
-				if(markedList == null) {
-					markedList = new ArrayList<File>();
+				if(! file.exists()) {
+					if(markedList == null) {
+						markedList = new ArrayList<File>();
+					}
+					markedList.add(file);
 				}
-				markedList.add(file);	
+				try {
+					state.getRandomAccessFile().close();
+				} catch(Exception e) {}
 			}
 		}
 		if(markedList != null) {
 			for(File file : markedList) {
 				FileState state = oldWatchMap.remove(file);
-				try {
-					state.getRandomAccessFile().close();
-				} catch(Exception e) {}
+
 				logger.trace("\tFile : " + file + " removed");
 			}
 		}