jody/alertmon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add local time/date and devcie name conversions to alert email.

Browse Source
This commit is contained in:
jkaplon 2015-08-05 14:46:33 -04:00
parent 722fb44f7c
commit 2a897e0bef
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
alertmonUtils.js
View File

@ -11,3 +11,15 @@ exports.getLocDateFromUTC = function(utcDtTm) {
localDt = moment(localDt).tz('America/New_York').format('MM-DD-YYYY'); localDt = moment(localDt).tz('America/New_York').format('MM-DD-YYYY');
return localDt; return localDt;
}; };
exports.getCoreNameFromCoreId = function(db, coreId) {
db.all('SELECT coreName FROM Cores WHERE coreId = ? LIMIT 1;', coreId, function(err, rows){
if (err !== null) {
console.log(err);
} else {
return rows.coreName;
}
}
);
};

8
server.js
View File

@ -176,9 +176,6 @@ app.get('/core/:id', function(req, res){
// Loop over elements in rows array, convert ugly UTC times to pretty local times. // Loop over elements in rows array, convert ugly UTC times to pretty local times.
rows.forEach(function(row){ rows.forEach(function(row){
//var localDtTm = moment.utc(new Date(row.published_at));
//localDtTm = moment(localDtTm).tz('America/New_York').format('MM-DD-YYYY HH:mm:ss');
//row.published_at = localDtTm;
row.pubDate = alertmonUtils.getLocDateFromUTC(row.published_at); row.pubDate = alertmonUtils.getLocDateFromUTC(row.published_at);
row.pubTime = alertmonUtils.getLocTimeFromUTC(row.published_at); row.pubTime = alertmonUtils.getLocTimeFromUTC(row.published_at);
}); });
@ -188,7 +185,6 @@ app.get('/core/:id', function(req, res){
}); });
} }
}); });
//res.send;
}); });
app.post('/', function(req, res){ app.post('/', function(req, res){
@ -213,8 +209,8 @@ app.post('/', function(req, res){
if(status.toLowerCase().indexOf('alert') > -1){ if(status.toLowerCase().indexOf('alert') > -1){
mailOptions.text = 'An alert message was received: \n\n'; mailOptions.text = 'An alert message was received: \n\n';
mailOptions.text = mailOptions.text + 'Status message, ' + status + '\n'; mailOptions.text = mailOptions.text + 'Status message, ' + status + '\n';
mailOptions.text = mailOptions.text + 'Published at, ' + pubAt + '\n'; mailOptions.text = mailOptions.text + 'Published at, ' + alertmonUtils.getLocDateFromUTC(pubAt) + ' ' + alertmonUtils.getLocTimeFromUTC(pubAt) + '\n';
mailOptions.text = mailOptions.text + 'From device, ' + coreid + '\n'; mailOptions.text = mailOptions.text + 'From device, ' + alertmonUtils.getCoreNameFromCoreId(coreid) + '\n';
transporter.sendMail(mailOptions, function(error, info){ transporter.sendMail(mailOptions, function(error, info){
if(error){ if(error){