Better error logging when calendars do not load.

deephaven · Jan 12, 2024 · ba8ad77 · ba8ad77
1 parent d11f342
commit ba8ad77
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/engine/time/src/main/java/io/deephaven/time/calendar/BusinessCalendarXMLParser.java b/engine/time/src/main/java/io/deephaven/time/calendar/BusinessCalendarXMLParser.java
@@ -141,7 +141,7 @@ private static Element getRequiredChild(@NotNull final Element root, final Strin
         if (element != null) {
             return element;
         } else {
-            throw new Exception("Missing the '" + child + "' tag in calendar file: text=" + root.getText());
+            throw new Exception("Missing the '" + child + "' tag in calendar file: text=" + root.getTextTrim());
         }
     }
 

diff --git a/engine/time/src/main/java/io/deephaven/time/calendar/Calendars.java b/engine/time/src/main/java/io/deephaven/time/calendar/Calendars.java
@@ -63,8 +63,11 @@ private static void loadProperty(final Configuration configuration, final String
         final String location = configuration.getProperty(property);
         try {
             load(location);
-        } catch (NoSuchFileException e) {
-            logger.warn().append("Problem loading calendars. importPath=").append(location).append(e).endl();
+        } catch (Exception e) {
+            logger.warn().append("Problem loading calendars. property=").append(property)
+                    .append(" importPath=").append(location).append(e).endl();
+            throw new RuntimeException("Problem loading calendars. property=" + property +
+                    " importPath=" + location, e);
         }
     }
 
@@ -90,18 +93,15 @@ private static void load(final String businessCalendarConfig) throws NoSuchFileE
                     logger.warn("Could not open " + filePath + " from classpath");
                     throw new RuntimeException("Could not open " + filePath + " from classpath");
                 }
-            } catch (IOException e) {
+            } catch (Exception e) {
                 logger.warn("Problem loading calendar: location=" + businessCalendarConfig, e);
                 throw new RuntimeException("Problem loading calendar: location=" + businessCalendarConfig, e);
             }
         };
 
         try (final BufferedReader config = new BufferedReader(new InputStreamReader(configToLoad))) {
             config.lines().forEach(consumer);
-        } catch (NoSuchFileException e) {
-            logger.warn("Problem loading calendar: location=" + businessCalendarConfig, e);
-            throw e;
-        } catch (IOException e) {
+        } catch (Exception e) {
             logger.warn("Problem loading calendar: location=" + businessCalendarConfig, e);
             throw new RuntimeException("Problem loading calendar: location=" + businessCalendarConfig, e);
         }