changed name, general improvements

.gitignore

@@ -1,2 +1,3 @@
 conf.json
 node_modules
+npm-debug.log

index.js

@@ -2,6 +2,7 @@ var http = require("http");
 var https = require("https");
 var fs = require("fs");
 var Context = require("./lib/context.js");
+var Db = require("./lib/db.js");
 
 var conf = JSON.parse(fs.readFileSync("conf.json"));
 
@@ -11,7 +12,7 @@ var endpoints = {
 	"/viewer": "viewer.node.js"
 }
 
-//Prepare files
+//Prepare endpoints
 var errs = false;
 Object.keys(endpoints).forEach(function(i) {
 	try {
@@ -46,6 +47,7 @@ fs.readdirSync("templates").forEach(function(f) {
 	templates[f.replace(/\.html$/, "")] = fs.readFileSync("templates/"+f, "utf8");
 });
 
+//Function to run on each request
 function onRequest(req, res) {
 	console.log("Request for "+req.url);
 
@@ -65,12 +67,18 @@ function onRequest(req, res) {
 	}
 }
 
-var server;
-if (conf.use_https) {
-	server = https.createServer(conf.https, onRequest);
-} else {
-	server = http.createServer(onRequest);
-}
-server.listen(conf.port);
+//Initiate a postgresql client
+var db = new Db(conf.db, function(err) {
+	if (err) throw err;
 
-console.log("Listening on port "+conf.port+".");
+	//Create HTTP or HTTPS server
+	var server;
+	if (conf.use_https) {
+		server = https.createServer(conf.https, onRequest);
+	} else {
+		server = http.createServer(onRequest);
+	}
+	server.listen(conf.port);
+
+	console.log("Listening on port "+conf.port+".");
+});

lib/db.js

@@ -1,6 +1,6 @@
 var pg = require("pg");
 
-module.expors = function(conf, cb) {
+module.exports = function(conf, cb) {
 	var conStr =
 		"postgres://"+
 		conf.user+":"+
@@ -17,5 +17,7 @@ module.expors = function(conf, cb) {
 }
 
 module.exports.prototype = {
-	query: function
+	query: function(str) {
+		this.client.query(str);
+	}
 }

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "mimg",
+  "name": "mimage",
   "version": "0.0.0",
   "description": "A simple image host.",
   "main": "index.js",
@@ -7,7 +7,11 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "start": "node index.js"
   },
-  "author": "Martin Dørum Nygaard",
+  "author": {
+    "name": "Martin Dørum Nygaard",
+    "email": "martid0311@gmail.com",
+    "url": "http://mort.coffee"
+  },
   "license": "GPLv2",
   "dependencies": {
     "pg": "^4.4.0"