1 files changed, 10 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerModule.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerModule.java
index e16bd383c2..ef429461a3 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerModule.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerModule.java
@@ -59,7 +59,16 @@ public class WorkerModule extends BlazeModule {
     if (workerFactory == null) {
       Path logDir = env.getOutputBase().getRelative("worker-logs");
       try {
-        logDir.createDirectory();
+        if (!logDir.createDirectory()) {
+          // Clean out old log files.
+          for (Path logFile : logDir.getDirectoryEntries()) {
+            try {
+              logFile.delete();
+            } catch (IOException e) {
+              env.getReporter().handle(Event.error("Could not delete old worker log: " + logFile));
+            }
+          }
+        }
       } catch (IOException e) {
         env
             .getReporter()