Fixed file leaking. Heartbeat file is now closed by admin after being…

… used
marqHQ · Jun 23, 2021 · 1fa697b · 1fa697b
1 parent 27b954d
commit 1fa697b
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/admin/app/com/lucidchart/piezo/admin/controllers/HealthCheck.scala b/admin/app/com/lucidchart/piezo/admin/controllers/HealthCheck.scala
@@ -30,12 +30,18 @@ class HealthCheck(configuration: Configuration, cc: ControllerComponents) extend
  }
 
   def areWorkersHealthy(): (Boolean, String) = {
-    val heartbeatFile = Source.fromFile(heartbeatFilename).getLines().toList
-    val heartbeatTimestamp = heartbeatFile(0)
-    val formatter = ISODateTimeFormat.dateTimeNoMillis().withZoneUTC()
-    val heartbeatTime = formatter.parseDateTime(heartbeatTimestamp)
-    val currentTime = new DateTime
-    val isTimestampRecent = Minutes.minutesBetween(heartbeatTime, currentTime).getMinutes < minutesBetweenBeats
-    (isTimestampRecent, formatter.print(heartbeatTime))
+    val heartbeatFile = Source.fromFile(heartbeatFilename)
+    try {
+      val heartbeatFileLines = heartbeatFile.getLines().toList
+      val heartbeatTimestamp = heartbeatFileLines(0)
+      val formatter = ISODateTimeFormat.dateTimeNoMillis().withZoneUTC()
+      val heartbeatTime = formatter.parseDateTime(heartbeatTimestamp)
+      val currentTime = new DateTime
+      val isTimestampRecent = Minutes.minutesBetween(heartbeatTime, currentTime).getMinutes < minutesBetweenBeats
+      (isTimestampRecent, formatter.print(heartbeatTime))
+    }
+    finally {
+      heartbeatFile.close()
+    }
  }
 }