From 83b8f3f52d72de9fd03693b9dc3a3a409951953c Mon Sep 17 00:00:00 2001 From: John Crepezzi Date: Fri, 18 Nov 2011 18:04:24 -0500 Subject: [PATCH] Generalize store --- config.js | 7 ++++++- lib/file_document_store.js | 6 ++---- server.js | 25 ++++++++++++++++--------- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/config.js b/config.js index 7ccdd64..502b766 100644 --- a/config.js +++ b/config.js @@ -11,6 +11,11 @@ "type": "Console", "colorize": true } - ] + ], + + "storage": { + "type": "file", + "path": "./data" + } } diff --git a/lib/file_document_store.js b/lib/file_document_store.js index 3fe0326..b8aba00 100644 --- a/lib/file_document_store.js +++ b/lib/file_document_store.js @@ -4,11 +4,9 @@ var winston = require('winston'); var hashlib = require('hashlib'); // For storing in files -// TODO make data path configurable -// TODO make store type configurable -var FileDocumentStore = function(path) { - this.basePath = path; +var FileDocumentStore = function(options) { + this.basePath = options.path || './data'; }; // Save data in a file, key as md5 - since we don't know what we could be passed here diff --git a/server.js b/server.js index ed86a1a..d52e90f 100644 --- a/server.js +++ b/server.js @@ -6,7 +6,6 @@ var winston = require('winston'); var StaticHandler = require('./lib/static_handler'); var DocumentHandler = require('./lib/document_handler'); -var FileDocumentStore = require('./lib/file_document_store'); // Load the configuration and set some defaults var config = JSON.parse(fs.readFileSync('config.js', 'utf8')); @@ -29,34 +28,42 @@ if (config.logging) { // TODO implement command line -// Set the server up -http.createServer(function(request, response) { +// build the store from the config on-demand - so that we don't load it +// for statics +var preferredStore = function() { + if (!config.storage) { + config.storage = { type: 'file' }; + } + if (!config.storage.type) { + config.storage.type = 'file'; + } + var Store = require('./lib/' + config.storage.type + '_document_store'); + return new Store(config.storage); +}; +// Set the server up and listen forever +http.createServer(function(request, response) { var incoming = url.parse(request.url, false); var handler = null; - // Looking to add a new doc if (incoming.pathname.match(/^\/documents$/) && request.method == 'POST') { handler = new DocumentHandler({ keyLength: config.keyLength, - store: new FileDocumentStore('./data') + store: preferredStore() }); return handler.handlePost(request, response); } - // Looking up a doc var match = incoming.pathname.match(/^\/documents\/([A-Za-z0-9]+)$/); if (request.method == 'GET' && match) { handler = new DocumentHandler({ - store: new FileDocumentStore('./data') + store: preferredStore() }); return handler.handleGet(match[1], response); } - // Otherwise, look for static file handler = new StaticHandler('./static'); handler.handle(incoming.pathname, response); - }).listen(config.port, config.host); winston.info('listening on ' + config.host + ':' + config.port);