Merge pull request #3 from nodejitsu/debug

Replaced log4js with debug, pass `require` to defaultable

api.js

@@ -40,4 +40,4 @@ module.exports =
           , 'Message': message.Message
           };
 
-}) // defaultable
+}, require) // defaultable

couch.js

@@ -31,6 +31,7 @@ var lib = require('./lib')
   , events = require('events')
   , assert = require('assert')
   , follow = require('follow')
+  , debug = require('debug')
   , querystring = require('querystring')
 
 //
@@ -52,8 +53,7 @@ function Couch (opts) {
   self.time_C  = opts.time_C  || null;
   self.known_dbs = null;
 
-  self.log = lib.log4js.getLogger('Couch/' + self.url);
-  self.log.setLevel(lib.LOG_LEVEL);
+  self.log = debug('cqs:couch:' + self.url);
 }
 
 Couch.prototype.request = function(opts, callback) {
@@ -70,7 +70,7 @@ Couch.prototype.request = function(opts, callback) {
     if(er) return callback(er);
 
     var method = opts.method || 'GET';
-    self.log.debug(method + ' ' + opts.uri);
+    self.log(method + ' ' + opts.uri);
     return lib.req_json(opts, callback);
   })
 }
@@ -114,22 +114,22 @@ Couch.prototype.confirmed = function confirm_couch(callback) {
   }
 
   confirmer.job(function(done) {
-    self.log.debug('Confirming Couch: ' + self.url);
+    self.log('Confirming Couch: ' + self.url);
 
     req(self.url, function(er, resp, body) {
       if(er) return done(er);
 
       if(body.couchdb !== 'Welcome')
         return done(new Error('Bad CouchDB response from ' + self.url));
 
-      self.log.debug('Confirming session');
+      self.log('Confirming session');
       req(self.url + '/_session', function(er, resp, session) {
         if(er) return done(er);
 
         if(!session.userCtx)
           return done(new Error('Bad CouchDB response: ' + self.url + '/_session'));
 
-        self.log.debug('Couch confirmed: ' + self.url + ': ' + lib.JS(session.userCtx));
+        self.log('Couch confirmed: ' + self.url + ': ' + lib.JS(session.userCtx));
         var known_dbs = {};
         return done(null, session.userCtx, known_dbs);
       })
@@ -153,8 +153,7 @@ function Database (opts) {
   self.secObj = null;
   self.known_queues = null;
 
-  self.log = lib.log4js.getLogger('DB/' + self.name);
-  self.log.setLevel(process.env.cqs_log_level || "info");
+  self.log = debug('cqs:db:' + self.name);
 }
 
 
@@ -207,21 +206,21 @@ Database.prototype.confirmed = function(callback) {
   })
 
   function confirm_db(done) {
-    self.log.debug('Confirming DB: ' + self.name);
+    self.log('Confirming DB: ' + self.name);
     self.couch.request(self.name, function(er, resp, db) {
       if(er) return done(er);
 
       if(db.db_name !== self.name)
         return done(new Error('Expected DB name "'+self.name+'": ' + db.db_name));
 
-      self.log.debug('Checking _security: ' + self.name);
+      self.log('Checking _security: ' + self.name);
       self.couch.request(self.name+'/_security', function(er, resp, secObj) {
         if(er) return done(er);
 
         if(!secObj)
           return done(new Error('Bad _security response from ' + self.name + ': ' + lib.JS(secObj)));
 
-        self.log.debug('Confirmed DB: ' + self.name + ': ' + lib.JS(secObj));
+        self.log('Confirmed DB: ' + self.name + ': ' + lib.JS(secObj));
         var known_queues = {};
         return done(null, secObj, known_queues);
       })
@@ -319,4 +318,4 @@ UUIDGetter.prototype.respond = function(waiter) {
   callback(null, response);
 }
 
-}) // defaultable
+}, require) // defaultable

ddoc.js

@@ -20,6 +20,7 @@ var fs = require('fs')
   , lib = require('./lib')
   , path = require('path')
   , util = require('util')
+  , debug = require('debug')
   , assert = require('assert')
   ;
 
@@ -207,8 +208,7 @@ function DDoc () {
 }
 
 // One common logger for them all, just so it won't get stored in couch.
-DDoc.prototype.log = lib.log4js.getLogger('ddoc');
-DDoc.prototype.log.setLevel(lib.LOG_LEVEL);
+DDoc.prototype.log = debug('cqs:ddoc');
 
 DDoc.prototype.copy_template = function() {
   var self = this;
@@ -283,4 +283,4 @@ function func_from_template(func) {
 }
 
 
-}) // defaultable
+}, require) // defaultable

lib.js

@@ -14,16 +14,12 @@
 
 require('defaultable')(module,
   { 'request_timeout': 5000
-  , 'log_module'     : null
   , 'strictSSL'      : true
   }, function(module, exports, DEFS, require) {
 
 var request = require('request').defaults({'strictSSL': DEFS.strictSSL})
   , events = require('events')
 
-exports.log4js = DEFS.log_module || require('log4js')
-exports.LOG_LEVEL = process.env.cqs_log_level || "info";
-
 // A workaround since defaultable seems to be breaking `instanceof` since it re-evaluates modules a lot.
 exports.instanceof = function instance0f(obj, type) {
   if(typeof type != 'function' || typeof obj != 'object')
@@ -174,4 +170,4 @@ Once.prototype.job = function(task) {
   }
 }
 
-}) // defaultable
+}, require) // defaultable

message.js

@@ -21,6 +21,7 @@ var lib = require('./lib')
   , couch = require('./couch')
   , events = require('events')
   , assert = require('assert')
+  , debug = require('debug')
   , querystring = require('querystring')
   ;
 
@@ -45,8 +46,7 @@ function Message (opts) {
   self.queue       = opts.queue       || null;
   self.is_heartbeat= opts.is_heartbeat|| false;
 
-  self.log = lib.log4js.getLogger('Message/' + (self.MessageId || 'untitled'));
-  self.log.setLevel(lib.LOG_LEVEL);
+  self.log = debug('cqs:message:' + (self.MessageId || 'untitled'));
 }
 util.inherits(Message, events.EventEmitter);
 
@@ -103,7 +103,7 @@ Message.prototype.send = function send_message(cb) {
               , 'Body'         : self.Body
               };
 
-    //self.log.debug('PUT\n' + util.inspect(doc));
+    //self.log = debug('PUT\n' + util.inspect(doc));
     db.request({method:'PUT',uri:lib.enc_id(doc._id), json:doc}, function(er, resp, result) {
       if(er) return cb(er);
 
@@ -281,10 +281,10 @@ Message.prototype.del = function message_del(callback) {
   self.queue.db.request(req, function(er, resp, result) {
     // Note: delete always returns success.
     if(er)
-      self.log.info('Failed to delete ' + id + ': ' + er.message);
+      self.log = debug('Failed to delete ' + id + ': ' + er.message);
 
     if(!result || result.ok !== true)
-      self.log.info('Unknown response to delete' + lib.JS(result));
+      self.log = debug('Unknown response to delete' + lib.JS(result));
 
     Object.keys(self).forEach(function (key) {
       if(/^[A-Z]/.test(key))
@@ -331,4 +331,4 @@ module.exports = { "Message" : Message
 // Utilities
 //
 
-}) // defaultable
+}, require) // defaultable

package.json

@@ -13,7 +13,7 @@
                      , "browser-request" : "~0.2"
                      , "defaultable": "0.7.2"
                      , "follow": "~0.8.0"
-                     , "log4js": "~0.5.4"
+                     , "debug": "~0.7.2"
                      , "txn": "~0.2.10"
                      }
 

queue.js

@@ -17,13 +17,13 @@ var defaultable = require('defaultable');
 defaultable(module,
   { 'visibility_timeout' : 30
   , 'browser_attachments': false
-  , 'allow_foreign_docs' : false
   }, function(module, exports, DEFS, require) {
 
 
 var lib = require('./lib')
   , txn = require('txn')
   , util = require('util')
+  , debug = require('debug')
   , couch = require('./couch')
   , assert = require('assert')
   , message = require('./message')
@@ -57,10 +57,8 @@ function Queue (opts) {
 
   self.cache_confirmation = true;
   self.browser_attachments = !!(opts.browser_attachments);
-  self.allow_foreign_docs = opts.allow_foreign_docs
 
-  self.log = lib.log4js.getLogger('queue/' + (self.name || 'untitled'));
-  self.log.setLevel(lib.LOG_LEVEL);
+  self.log = debug('cqs:queue:' + (self.name || 'untitled'));
 }
 
 Queue.prototype.confirm =
@@ -96,7 +94,7 @@ Queue.prototype.confirmed = function after_confirmed(opt, callback) {
   })
 
   function confirm_queue(done) {
-    self.log.debug('Confirming queue: ' + self.name);
+    self.log('Confirming queue: ' + self.name);
     self.db.request(lib.enc_id(DDOC_ID), function(er, res) {
       if(er)
         return done(er)
@@ -105,7 +103,7 @@ Queue.prototype.confirmed = function after_confirmed(opt, callback) {
         if(opt != '--allow-missing')
           return done(new Error('Queue does not exist: ' + self.name))
 
-        self.log.warn('Using non-existent queue: ' + self.name)
+        self.log('Using non-existent queue: ' + self.name)
         res.body.queues[self.name] = {}
       }
 
@@ -125,14 +123,12 @@ Queue.prototype.create = function create_queue(callback) {
   })
 
   function add_queue(ddoc, to_txn) {
-    //self.log.debug('Add queue to ddoc: %j', ddoc)
+    //self.log('Add queue to ddoc: %j', ddoc)
     var now = new Date
 
     if(!ddoc._rev)
       ddoc = new queue_ddoc.DDoc
 
-    ddoc.allow_foreign_docs = self.allow_foreign_docs
-
     ddoc.queues[self.name] = ddoc.queues[self.name] ||
       { ApproximateNumberOfMessages          : 0
       , ApproximateNumberOfMessagesNotVisible: 0
@@ -157,8 +153,8 @@ Queue.prototype.create = function create_queue(callback) {
     if(er)
       return callback(er)
 
-    self.log.debug('new_ddoc: %j', new_ddoc._id)
-    self.log.debug('Created queue: ' + self.name)
+    self.log('new_ddoc: %j', new_ddoc._id)
+    self.log('Created queue: ' + self.name)
 
     // Consider myself confirmed as well.
     self.db.known_queues[self.name] = new lib.Once
@@ -241,12 +237,12 @@ Queue.prototype.receive = function(opts, callback) {
       var messages = [], count = 0;
       function on_receive(er, pos, msg) {
         if(er && er.statusCode != 409 && er.error != 'conflict') {
-          self.log.debug('Receive error: ' + er);
+          self.log('Receive error: ' + er);
           return callback(er);
         }
 
         if(er && er.statusCode == 409 && er.error == 'conflict') {
-          self.log.debug('Missed message '+pos+': ' + msg.MessageId);
+          self.log('Missed message '+pos+': ' + msg.MessageId);
           msg = null;
         }
 
@@ -368,7 +364,7 @@ Queue.prototype.set = function set_attrs(opts, callback) {
 
   opts = lib.JDUP(opts)
 
-  self.log.debug('Set attributes: ' + self.name);
+  self.log('Set attributes: ' + self.name);
   self.confirmed('--force', function(er) {
     if(er)
       return callback(er)
@@ -394,7 +390,7 @@ Queue.prototype.set = function set_attrs(opts, callback) {
   })
 
   function update_attrs(ddoc, to_txn) {
-    //self.log.debug('Update queue on ddoc: %j', ddoc)
+    //self.log('Update queue on ddoc: %j', ddoc)
     var now = new Date
       , queue = ddoc.queues[self.name]
 
@@ -442,7 +438,7 @@ Queue.prototype.GetAttributes = function get_attrs(attrs, callback, extra) {
   assert.ok(Array.isArray(attrs));
   assert.ok(callback);
 
-  self.log.debug('Get attributes: ' + self.name);
+  self.log('Get attributes: ' + self.name);
   confirmer(function(er) {
     if(er) return callback(er);
     callback(null, self);
@@ -568,4 +564,4 @@ module.exports = { "Queue" : Queue
 //
 
 
-}) // defaultable
+}, require) // defaultable