From 92297f719188fbb785f65f08ca68e903694f2935 Mon Sep 17 00:00:00 2001 From: Ed Bukoski Date: Mon, 27 Jun 2016 14:24:40 -0700 Subject: [PATCH] Fix issue with dates and RDSJanitorResourceTracker --- .../janitor/RDSJanitorResourceTracker.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/netflix/simianarmy/aws/janitor/RDSJanitorResourceTracker.java b/src/main/java/com/netflix/simianarmy/aws/janitor/RDSJanitorResourceTracker.java index 4c2f9e8a..5bceeae3 100644 --- a/src/main/java/com/netflix/simianarmy/aws/janitor/RDSJanitorResourceTracker.java +++ b/src/main/java/com/netflix/simianarmy/aws/janitor/RDSJanitorResourceTracker.java @@ -264,18 +264,19 @@ private Resource mapResource(ResultSet rs) throws SQLException { throw new SQLException(msg); } return resource; - } - - private String millisToFormattedDate(String millisStr) { - String datetime = null; - try { - long millis = Long.parseLong(millisStr); - AWSResource.DATE_FORMATTER.print(millis); - } catch(NumberFormatException nfe) { - } - return datetime; } + private String millisToFormattedDate(String millisStr) { + String datetime = null; + try { + long millis = Long.parseLong(millisStr); + datetime = AWSResource.DATE_FORMATTER.print(millis); + } catch(NumberFormatException nfe) { + LOGGER.error(String.format("Error parsing datetime %s when reading from RDS", millisStr)); + } + return datetime; + } + @Override public Resource getResource(String resourceId) { Validate.notEmpty(resourceId);