voterunner

commit

dff2039ba6c2232657660c4a58ebf4096fed77a0

parent

864d1372c1453608900c02f1f1117f639d9bb161

Author

Tobias Bengfort <tobias.bengfort@posteo.de>

Date

2017-11-18 08:26

switch to any-db to allow sqlite for development

Diffstat

2 files changed, 6 insertions, 17 deletions

diff --git a/app.js b/app.js

@@ -13,7 +13,7 @@ var http = require('http');
   13    13 var app = express();
   14    14 var server = http.Server(app);
   15    15 var io = require('socket.io').listen(server);
   16    -1 var pg = require('pg');
   -1    16 var anyDB = require('any-db');
   17    17 var fs = require('fs');
   18    18 var log4js = require('log4js');
   19    19 
@@ -28,20 +28,7 @@ server.listen(PORT, HOST, function() {
   28    28 	log.info('Listening on ' + HOST + ':' + PORT);
   29    29 });
   30    30 
   31    -1 var parseDatabaseUrl = function(databaseUrl) {
   32    -1 	var params = url.parse(databaseUrl);
   33    -1 	var auth = params.auth.split(':');
   34    -1 
   35    -1 	return {
   36    -1 		user: auth[0],
   37    -1 		password: auth[1],
   38    -1 		host: params.hostname,
   39    -1 		port: params.port,
   40    -1 		database: params.pathname.split('/')[1],
   41    -1 	};
   42    -1 };
   43    -1 
   44    -1 var db = new pg.Pool(parseDatabaseUrl(DATABASE_URL));
   -1    31 var db = anyDB.createPool(DATABASE_URL);
   45    32 
   46    33 var throwErr = function(err) {
   47    34 	if (err) throw err;

diff --git a/package.json b/package.json

@@ -2,10 +2,12 @@
    2     2 	"name": "voterunner",
    3     3 	"version": "0.0.1",
    4     4 	"dependencies": {
    5    -1 		"socket.io": "^1.4.8",
   -1     5 		"any-db": "^2.2.0",
   -1     6 		"any-db-postgres": "^2.1.5",
   -1     7 		"any-db-sqlite3": "^2.1.4",
    6     8 		"express": "^4.14.0",
    7     9 		"log4js": "^0.6.38",
    8    -1 		"pg": "^6.0.3"
   -1    10 		"socket.io": "^1.4.8"
    9    11 	},
   10    12 	"devDependencies": {
   11    13 		"markdown-it": "^7.0.0",