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

Fix undefined checks left over from sqlite, use postgres-friendly result.rowCount.

Browse Source
This commit is contained in:
jkaplon 2015-12-10 13:04:10 -05:00
parent e138b3f8d1
commit cab17d28c5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -9,7 +9,8 @@
"moment-timezone": "^0.4.0", "moment-timezone": "^0.4.0",
"nodemailer": "^1.3.4", "nodemailer": "^1.3.4",
"pg": "^4.4.2", "pg": "^4.4.2",
"sqlite3": "^3.0.8" "sqlite3": "^3.0.8",
"winston": "^2.1.1"
}, },
"scripts": { "scripts": {
"start": "node server.js" "start": "node server.js"

4
server.js
View File

@ -130,7 +130,7 @@ app.post('/core/edit/:id', function(req, res){
done(); done();
if(err) { return console.error('error running query', err); } if(err) { return console.error('error running query', err); }
if(typeof result == 'undefined') { if(typeof result.rowCount == 0) {
client.query( client.query(
"INSERT INTO cores (coreid, corename, locationdesc) VALUES ($1, $2, $3);", "INSERT INTO cores (coreid, corename, locationdesc) VALUES ($1, $2, $3);",
[coreId, req.body.deviceName, req.body.locationDesc] [coreId, req.body.deviceName, req.body.locationDesc]
@ -217,7 +217,7 @@ app.post('/', function(req, res){
pg.connect(conString, function(err, client, done) { pg.connect(conString, function(err, client, done) {
if(err) { return console.error('error fetching client from pool', err); } if(err) { return console.error('error fetching client from pool', err); }
client.query('SELECT corename FROM cores WHERE coreid = $1;', [coreid], function(err, result) { client.query('SELECT corename FROM cores WHERE coreid = $1;', [coreid], function(err, result) {
if ((err) || (typeof result == undefined)) { if ((err) || (typeof result.rowCount == 0)) {
// Don't care about this error or empty result set, still need to send email. // Don't care about this error or empty result set, still need to send email.
result.rows[0].corename = '# No Name #'; result.rows[0].corename = '# No Name #';
} }