From 714938531b3884ac5addfe2ce4a2e22e2bc9971a Mon Sep 17 00:00:00 2001
From: LSmyrnaios <lsmyrnaios@gmail.com>
Date: Thu, 11 May 2023 03:14:56 +0300
Subject: [PATCH] - Add the time-zone in the logs. - Code polishing.

---
 .../eu/openaire/urls_worker/components/ScheduledTasks.java    | 1 +
 .../openaire/urls_worker/controllers/FullTextsController.java | 3 +--
 src/main/resources/logback-spring.xml                         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/eu/openaire/urls_worker/components/ScheduledTasks.java b/src/main/java/eu/openaire/urls_worker/components/ScheduledTasks.java
index 8e9d8fa..3d4302d 100644
--- a/src/main/java/eu/openaire/urls_worker/components/ScheduledTasks.java
+++ b/src/main/java/eu/openaire/urls_worker/components/ScheduledTasks.java
@@ -23,6 +23,7 @@ public class ScheduledTasks {
         if ( AssignmentsHandler.hadConnectionErrorOnRequest ) {
             if ( GeneralController.shouldShutdownWorker )   // Make sure the worker shuts-down, in case the user sends the relevant request, while the worker is stuck in a data-request error-loop.
                 // TODO - Should this worker inform the Controller that will shutdown?
+                // TODO - Yes, apart from this knowledge, it may be the case that we make the Controller to request the Workers to shutdown.
                 UrlsWorkerApplication.gentleAppShutdown();
             try {
                 Thread.sleep(900_000);  // Sleep for 15 mins to stall the scheduler from retrying right away, thus giving time to the Controller to recover.
diff --git a/src/main/java/eu/openaire/urls_worker/controllers/FullTextsController.java b/src/main/java/eu/openaire/urls_worker/controllers/FullTextsController.java
index 117c230..421d621 100644
--- a/src/main/java/eu/openaire/urls_worker/controllers/FullTextsController.java
+++ b/src/main/java/eu/openaire/urls_worker/controllers/FullTextsController.java
@@ -171,9 +171,8 @@ public class FullTextsController {
 
     public static boolean deleteFile(String fileFullPathString)
     {
-        File currentFile = new File(fileFullPathString);
         try {
-            FileDeleteStrategy.FORCE.delete(currentFile);
+            FileDeleteStrategy.FORCE.delete(new File(fileFullPathString));
         } catch (IOException e) {
             logger.error("Error when deleting the file: " + fileFullPathString);
             return false;
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index c596b83..4e65b53 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -15,14 +15,14 @@
         </triggeringPolicy>
         <encoder>
             <charset>UTF-8</charset>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}.%M\(@%line\) - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS z} [%thread] %-5level %logger{36}.%M\(@%line\) - %msg%n</pattern>
         </encoder>
     </appender>
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <charset>UTF-8</charset>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{36}.%M\(@%line\)) - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS z} [%thread] %highlight(%-5level) %cyan(%logger{36}.%M\(@%line\)) - %msg%n</pattern>
         </encoder>
     </appender>