close the tailer

johnmcclean · johnmcclean · commit b1237e8e0aad · 2016-11-08T12:07:25.000Z
diff --git a/micro-log-streamer/src/main/java/com/aol/micro/server/log/LogTailer.java b/micro-log-streamer/src/main/java/com/aol/micro/server/log/LogTailer.java
@@ -31,6 +31,7 @@ public void tail(TailerListener listener) {
         File file = new File(
                              fileLocation);
         Tailer tailer = Tailer.create(file, listener, 10);
+
         tailer.run();
     }
 
diff --git a/micro-log-streamer/src/main/java/com/aol/micro/server/log/rest/LogStreamer.java b/micro-log-streamer/src/main/java/com/aol/micro/server/log/rest/LogStreamer.java
@@ -84,11 +84,12 @@ public void write(OutputStream os) throws IOException, WebApplicationException {
     @AllArgsConstructor
     static class LogListener implements TailerListener {
         private final Writer writer;
+        private volatile Tailer tailer;
 
         @Override
         public void init(Tailer tailer) {
-            // TODO Auto-generated method stub
 
+            this.tailer = tailer;
         }
 
         @Override
@@ -97,7 +98,7 @@ public void fileNotFound() {
                 writer.write("File not found!");
                 writer.flush();
             } catch (IOException e) {
-
+                tailer.stop();
             }
 
         }
@@ -107,8 +108,7 @@ public void fileRotated() {
             try {
                 writer.flush();
             } catch (IOException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
+                tailer.stop();
             }
         }
 
@@ -121,22 +121,29 @@ public void handle(String line) {
                 writer.write("\n");
                 // writer.flush();
             } catch (IOException e) {
-                e.printStackTrace();
+                tailer.stop();
             }
 
         }
 
         @Override
         public void handle(Exception ex) {
-            ex.printStackTrace();
+
             try {
+                writer.write("Error " + ex.getMessage());
+                writer.write("/n");
                 writer.flush();
             } catch (IOException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
+                tailer.stop();
             }
         }
 
+        private LogListener(Writer writer) {
+
+            this.writer = writer;
+            this.tailer = null;
+        }
+
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public void tail(TailerListener listener) {`
`31`	`31`	`File file = new File(`
`32`	`32`	`fileLocation);`
`33`	`33`	`Tailer tailer = Tailer.create(file, listener, 10);`
	`34`	`+`
`34`	`35`	`tailer.run();`
`35`	`36`	`}`
`36`	`37`
Original file line number	Diff line number	Diff line change
`@@ -84,11 +84,12 @@ public void write(OutputStream os) throws IOException, WebApplicationException {`
`84`	`84`	`@AllArgsConstructor`
`85`	`85`	`static class LogListener implements TailerListener {`
`86`	`86`	`private final Writer writer;`
	`87`	`+ private volatile Tailer tailer;`
`87`	`88`
`88`	`89`	`@Override`
`89`	`90`	`public void init(Tailer tailer) {`
`90`		`- // TODO Auto-generated method stub`
`91`	`91`
	`92`	`+ this.tailer = tailer;`
`92`	`93`	`}`
`93`	`94`
`94`	`95`	`@Override`
`@@ -97,7 +98,7 @@ public void fileNotFound() {`
`97`	`98`	`writer.write("File not found!");`
`98`	`99`	`writer.flush();`
`99`	`100`	`} catch (IOException e) {`
`100`		`-`
	`101`	`+ tailer.stop();`
`101`	`102`	`}`
`102`	`103`
`103`	`104`	`}`
`@@ -107,8 +108,7 @@ public void fileRotated() {`
`107`	`108`	`try {`
`108`	`109`	`writer.flush();`
`109`	`110`	`} catch (IOException e) {`
`110`		`- // TODO Auto-generated catch block`
`111`		`- e.printStackTrace();`
	`111`	`+ tailer.stop();`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
`@@ -121,22 +121,29 @@ public void handle(String line) {`
`121`	`121`	`writer.write("\n");`
`122`	`122`	`// writer.flush();`
`123`	`123`	`} catch (IOException e) {`
`124`		`- e.printStackTrace();`
	`124`	`+ tailer.stop();`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`@Override`
`130`	`130`	`public void handle(Exception ex) {`
`131`		`- ex.printStackTrace();`
	`131`	`+`
`132`	`132`	`try {`
	`133`	`+ writer.write("Error " + ex.getMessage());`
	`134`	`+ writer.write("/n");`
`133`	`135`	`writer.flush();`
`134`	`136`	`} catch (IOException e) {`
`135`		`- // TODO Auto-generated catch block`
`136`		`- e.printStackTrace();`
	`137`	`+ tailer.stop();`
`137`	`138`	`}`
`138`	`139`	`}`
`139`	`140`
	`141`	`+ private LogListener(Writer writer) {`
	`142`	`+`
	`143`	`+ this.writer = writer;`
	`144`	`+ this.tailer = null;`
	`145`	`+ }`
	`146`	`+`
`140`	`147`	`}`
`141`	`148`
`142`	`149`	`}`