From 4adfd86fb558633463b86e2026aaea88e3585067 Mon Sep 17 00:00:00 2001
From: genuineparts <bernhard@becast.at>
Date: Tue, 4 Mar 2025 19:10:55 +0100
Subject: [PATCH] Added more Error Handling and improved log readability

---
 src/main/java/be/jaud/Main.java      |  2 +-
 src/main/java/be/jaud/OebbCheck.java | 14 ++++++++++++--
 src/main/resources/logback.xml       |  4 ++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/java/be/jaud/Main.java b/src/main/java/be/jaud/Main.java
index 66260a0..61765ad 100644
--- a/src/main/java/be/jaud/Main.java
+++ b/src/main/java/be/jaud/Main.java
@@ -17,7 +17,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
 public class Main {
-    private static final String version = "0.5";
+    private static final String version = "0.6";
     private static final HashMap<String, Integer> data = new HashMap<>();
     public static Settings conf;
     static OebbCheck check = new OebbCheck();
diff --git a/src/main/java/be/jaud/OebbCheck.java b/src/main/java/be/jaud/OebbCheck.java
index bb6e982..979e84b 100644
--- a/src/main/java/be/jaud/OebbCheck.java
+++ b/src/main/java/be/jaud/OebbCheck.java
@@ -1,6 +1,7 @@
 package be.jaud;
 
 import org.json.JSONArray;
+import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -68,7 +69,11 @@ public class OebbCheck {
     private static JSONArray getData(String Station, String Time, String maxjourneys) throws IOException, URISyntaxException {
         URL url = new URI("https://fahrplan.oebb.at/bin/stboard.exe/dn?L=vs_scotty.vs_liveticker&evaId=" + Station + "&boardType=dep&time="+ Time +"&productsFilter=1011110111011&additionalTime=0&maxJourneys=" + maxjourneys + "&outputMode=tickerDataOnly&start=yes&selectDate=today").toURL();
         JSONObject jo = getJsonObject(url);
-        return jo.getJSONArray("journey");
+        if(jo!=null) {
+            return jo.getJSONArray("journey");
+        } else {
+            return null;
+        }
     }
 
     private static JSONObject getJsonObject(URL url) throws IOException {
@@ -83,6 +88,11 @@ public class OebbCheck {
         }
         in.close();
         String sub = content.substring(14);
-        return new JSONObject(sub);
+        try {
+            return new JSONObject(sub);
+        } catch (JSONException e){
+            LOG.error("Json Error! {} {}", e.getMessage(), sub);
+            return null;
+        }
     }
 }
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 71d8c79..41cad9a 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -4,14 +4,14 @@
         <!-- encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder
             by default -->
         <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%ex%n
+            <pattern>%d{dd.MM.yyyy HH:mm:ss} [%thread] %-5level %logger{36} - %msg%ex%n
             </pattern>
         </encoder>
     </appender>
     <appender name="FILE"
               class="ch.qos.logback.core.rolling.RollingFileAppender">
         <encoder>
-            <pattern>%-4relative [%thread] %-5level %logger{35} - %msg %ex %n</pattern>
+            <pattern>%d{dd.MM.yyyy HH:mm:ss} [%thread] %-5level %logger{35} - %msg %ex %n</pattern>
         </encoder>
         <file>logs/logfile.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">