Skip to content

Commit

Permalink
Tweaked options file to make it work better with setup_couch by default
Browse files Browse the repository at this point in the history
  • Loading branch information
josephg committed Oct 28, 2011
1 parent 1859ebf commit dbc4f2a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
14 changes: 7 additions & 7 deletions bin/options.js
Expand Up @@ -13,15 +13,15 @@ module.exports = {
prefix: 'ShareJS:',

// The hostname, port and options to pass to redis.
// null lets redis decide - redis by default connects to localhost port 6379.
hostname: null,
port: null,
redisOptions: null
// null lets the database decide - redis by default connects to localhost port 6379.
//hostname: null,
//port: null,
//redisOptions: null

// To use CouchDB uncomment this section then run bin/setup_couch:
// type: 'couchdb',
// hostname: "http://admin:admin@localhost",
// port: 5984
//type: 'couchdb',
//hostname: "http://admin:admin@localhost",
//port: 5984

},

Expand Down
2 changes: 1 addition & 1 deletion bin/setup_couch
Expand Up @@ -39,4 +39,4 @@ ensureResourceExists(db, {}, function(ok, err) {
if(err) throw new Error(err);
console.log('CouchDB has been setup!');
})
})
})
1 change: 0 additions & 1 deletion src/server/db/couchdb.js
Expand Up @@ -61,7 +61,6 @@ module.exports = function(options) {
if (!_.isObject(data.meta)) throw new Error('meta missing from data');

var doc = {_id: docName, type: "document", data: data};
console.warn('sdf');
request.post({uri: db, body: doc}
, function(err, resp, body) {
if (err) callback(err, false);
Expand Down

0 comments on commit dbc4f2a

Please sign in to comment.