From fd746d5523b02a100a3d90a97958473796f2736e Mon Sep 17 00:00:00 2001 From: jkaplon Date: Thu, 10 Dec 2015 12:54:47 -0500 Subject: [PATCH] Fix dead-man check, postgres returns a rowCount of 0, unlike sqlite which returns an undefined object if no rows returned. --- server.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/server.js b/server.js index 8512ab5..2ab3740 100644 --- a/server.js +++ b/server.js @@ -69,7 +69,6 @@ app.get('/', function(req, res){ } // Loop over elements in rows array, convert ugly UTC times to pretty local times. result.rows.forEach(function(row){ - winston.info(row.published_at); row.pubdate = courtsopenUtils.getLocDateFromUTC(row.published_at); row.pubtime = courtsopenUtils.getLocTimeFromUTC(row.published_at); if(row.status.toLowerCase().indexOf('closed') > -1){ @@ -145,7 +144,7 @@ setInterval(function() { done(); if(err) { return winston.error('error running query', err); - } else if (typeof result == "undefined") { + } else if (result.rowCount == 0) { mailOptions.text = "It's been too long since the last data transmission from device. \n\n"; winston.info(mailOptions.text); // Don't include any other details for now, will need to change DB query to get details on last message received. @@ -153,7 +152,7 @@ setInterval(function() { //mailOptions.text = mailOptions.text + 'Published at, ' + courtsopenUtils.getLocDateFromUTC(pubAt) + ' ' + courtsopenUtils.getLocTimeFromUTC(pubAt) + '\n'; transporter.sendMail(mailOptions, function(error, info){ if(error){ - winston.info(error); + winston.error(error); }else{ winston.info('Message sent: ' + info.response); }