fixed crash when end_message is missing

amahi · Aug 1, 2018 · 6edcb7d · 6edcb7d
1 parent 8c1536e
commit 6edcb7d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/views/rsnapshot_backups/index.html.slim b/app/views/rsnapshot_backups/index.html.slim
@@ -17,7 +17,7 @@
           br
 
           - alert_type = "alert-danger"
-          - alert_type = "alert-success" unless log[:end_message].index("completed successfully").blank?
+          - alert_type = "alert-success" unless log[:end_message].blank? or log[:end_message].index("completed successfully").blank?
           - alert_type = "alert-warning" if log[:end_message].blank?
 
           div class="alert #{alert_type} mt-2" role="alert"

diff --git a/lib/rsnapshot_backups/rsnapshot_log_util.rb b/lib/rsnapshot_backups/rsnapshot_log_util.rb
@@ -5,7 +5,9 @@
 class RsnapshotLogUtil
 	class << self
 		def parse_datetime_string(string)
-			DateTime.parse(string).ctime
+			parsed = DateTime.parse(string).strftime('%a, %d %b %Y %H:%M:%S')
+			ago_duration = time_ago_in_words(parsed).capitalize
+			parsed + " (#{ago_duration} ago)"
 		end
 
 		def get_log_file_path
@@ -18,6 +20,8 @@ def get_sample_log_file_path
 
 		def parse_log_file
 			log_enteries = []
+			return log_enteries unless File.exists?(get_log_file_path)
+
 			File.open(get_log_file_path, "r").each do |line|
 				if line =~ /\[.*\] \/bin\/rsnapshot (daily|weekly|monthly): .*/