When calling the delete log endpoint, return the list of logs deleted

Author: dima-groupon

SeleniumGridExtras/src/main/java/com/groupon/seleniumgridextras/tasks/DeleteOldLogsTask.java

@@ -5,6 +5,7 @@
 import com.google.gson.JsonObject;
 import com.groupon.seleniumgridextras.config.RuntimeConfig;
 import com.groupon.seleniumgridextras.tasks.config.TaskDescriptions;
+import com.groupon.seleniumgridextras.utilities.json.JsonCodec;
 import org.apache.log4j.Logger;
 
 import java.io.File;
@@ -21,11 +22,23 @@ public DeleteOldLogsTask() {
         setRequestType("GET");
         setResponseType("json");
         setClassname(this.getClass().getCanonicalName().toString());
+        addResponseDescription(JsonCodec.LOGS_DELETED, "List of logs deleted");
         setEnabledInGui(true);
     }
 
     @Override
     public JsonObject execute() {
+
+        List<String> listOfFilesAsString = new LinkedList<String>();
+
+        for (File f : deleteOldLogs(
+                RuntimeConfig.getConfig().getLogMaximumSize(),
+                RuntimeConfig.getConfig().getLogsDirectory())) {
+            listOfFilesAsString.add(f.getAbsolutePath());
+        }
+
+
+        getJsonResponse().addKeyValues(JsonCodec.LOGS_DELETED, listOfFilesAsString);
         return getJsonResponse().getJson();
     }
 
@@ -44,9 +57,12 @@ public JsonObject execute(String version) {
     public boolean initialize() {
 
         try {
-            List<File> deletedFiles = deleteOldLogs(RuntimeConfig.getConfig().getLogMaximumSize(), RuntimeConfig.getConfig().getLogsDirectory());
+            List<File> deletedFiles = deleteOldLogs(
+                    RuntimeConfig.getConfig().getLogMaximumSize(),
+                    RuntimeConfig.getConfig().getLogsDirectory()
+            );
 
-            for(File log : deletedFiles){
+            for (File log : deletedFiles) {
                 logger.info(String.format("Deleted log %s", log.getAbsolutePath()));
             }
         } catch (Exception error) {
@@ -83,7 +99,7 @@ protected List<File> deleteOldLogs(long bytesLimit, File logDir) {
 
             try {
                 currentFile.delete();
-            } catch (Exception e){
+            } catch (Exception e) {
                 logger.warn(String.format(
                         "Error deleting log file %s, error: %s, \n %s",
                         currentFile.getAbsolutePath(),

SeleniumGridExtras/src/main/java/com/groupon/seleniumgridextras/utilities/json/JsonCodec.java

@@ -15,6 +15,7 @@ public class JsonCodec {
     public static final String TRUE_INT = "1";
     public static final String WARNING = "__WARNING__";
     public static final String COMMAND = "command";
+    public static final String LOGS_DELETED = "logs_deleted";
 
     public static class SessionLogging {