Merge pull request #102 from jglick/FileMonitoringTask-logging

Better logging for FileMonitoringTask.Watcher
jenkinsci · Aug 5, 2019 · 93b86c9 · 93b86c9
2 parents 549a455 + 7bfff14
commit 93b86c9
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/durabletask/FileMonitoringTask.java b/src/main/java/org/jenkinsci/plugins/durabletask/FileMonitoringTask.java
@@ -473,6 +473,7 @@ private static class Watcher implements Runnable {
             this.handler = handler;
             this.listener = listener;
             cs = FileMonitoringController.transcodingCharset(controller.charset);
+            LOGGER.log(Level.FINE, "remote transcoding charset: {0}", cs);
         }
 
         @Override public void run() {
@@ -491,7 +492,9 @@ private static class Watcher implements Runnable {
                         InputStream locallyEncodedStream = Channels.newInputStream(ch.position(lastLocation));
                         InputStream utf8EncodedStream = cs == null ? locallyEncodedStream : new ReaderInputStream(new InputStreamReader(locallyEncodedStream, cs), StandardCharsets.UTF_8);
                         handler.output(utf8EncodedStream);
-                        lastLocationFile.write(Long.toString(ch.position()), null);
+                        long newLocation = ch.position();
+                        lastLocationFile.write(Long.toString(newLocation), null);
+                        LOGGER.log(Level.FINE, "copied {0} bytes from {1}", new Object[] {newLocation - lastLocation, logFile});
                     }
                 }
                 if (exitStatus != null) {
@@ -501,6 +504,7 @@ private static class Watcher implements Runnable {
                     } else {
                         output = null;
                     }
+                    LOGGER.log(Level.FINE, "exiting with code {0}", exitStatus);
                     handler.exited(exitStatus, output);
                     controller.cleanup(workspace);
                 } else {