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

Start conversion to postgresql; got connection to pg database without error linking alertmon-dev contianer to pg container.

Browse Source
This commit is contained in:
jkaplon 2015-10-03 18:42:28 -04:00
parent 0c19cf7913
commit 44765a46a4
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -8,6 +8,7 @@
"handlebars-form-helpers": "^0.1.3", "handlebars-form-helpers": "^0.1.3",
"moment-timezone": "^0.4.0", "moment-timezone": "^0.4.0",
"nodemailer": "^1.3.4", "nodemailer": "^1.3.4",
"pg": "^4.4.2",
"sqlite3": "^3.0.8" "sqlite3": "^3.0.8"
}, },
"scripts": { "scripts": {

12
server.js
View File

@ -6,7 +6,6 @@ var alertmonUtils = require('./alertmonUtils.js');
var fs = require("fs"); var fs = require("fs");
var bodyParser = require("body-parser"); var bodyParser = require("body-parser");
var app = express(); var app = express();
var logfile = fs.createWriteStream('./db/log.log', {flags: 'a'});
// Setup email // Setup email
var transporter = nodemailer.createTransport({ var transporter = nodemailer.createTransport({
@ -34,6 +33,15 @@ if(!exists) {
var sqlite3 = require("sqlite3").verbose(); var sqlite3 = require("sqlite3").verbose();
var db = new sqlite3.Database(file); var db = new sqlite3.Database(file);
var pg = require("pg");
var conString = "postgres://alertmon:alertmon@db/alertmon";
pg.connect(conString, function(err, client, done) {
if(err) {
return console.error('error fetching client from pool', err);
}
done();
});
db.serialize(function() { db.serialize(function() {
if(!exists) { if(!exists) {
@ -166,8 +174,6 @@ app.post('/core/edit/:id', function(req, res){
}); });
app.get('/core/:id', function(req, res){ app.get('/core/:id', function(req, res){
//res.sendFile("/usr/src/app/index.html");
//fs.createReadStream('./log.log').pipe(res);
var d = new Date(); var d = new Date();
var coreId = req.params.id; var coreId = req.params.id;
console.log("GET /core/" + coreId + ", " + JSON.stringify(d, 4)); console.log("GET /core/" + coreId + ", " + JSON.stringify(d, 4));