Comparing version 0.1.3 to 0.1.4
@@ -58,6 +58,18 @@ module.exports = function () { | ||
function wrap(msg, next, logger, meta) { | ||
return function (err, value) { | ||
try { | ||
logger.log('debug', 'CALLBACK: IN: %s, err:%j, value:%j', msg, err, value, meta); | ||
next(err, value); | ||
logger.log('debug', 'CALLBACK: OUT: %s, err:%j, value:%j', msg, err, value, meta); | ||
} catch (e) { | ||
logger.log('error', 'CALLBACK: OUT: ************* %s, err:%j, value:%j [EXCEPTION: %j] *************', msg, err, value, e, meta); | ||
} | ||
}; | ||
} | ||
Redis.prototype.get = function(key, next) { | ||
if (!this.isReady()) | ||
return next(new Error("redis:get(key=" + key + ")|state=" + this.state)); | ||
this.redis.get(key, next); | ||
this.redis.get(key, wrap('get(key='+key+')', next, this.logger, this.meta)); | ||
}; | ||
@@ -68,3 +80,3 @@ | ||
return next(new Error("redis:keys(pattern=" + pattern + ")|state=" + this.state)); | ||
this.redis.keys(pattern, next); | ||
this.redis.keys(pattern, wrap('keys(pattern='+pattern+')', next, this.logger, this.meta)); | ||
}; | ||
@@ -75,3 +87,3 @@ | ||
return next(new Error("redis:mget(keys=" + keys + ")|state=" + this.state)); | ||
this.redis.mget(keys, next); | ||
this.redis.mget(keys, wrap('mget(keys='+keys+')', next, this.logger, this.meta)); | ||
}; | ||
@@ -83,6 +95,6 @@ | ||
return next(new Error("redis:mgetkeys(pattern=" + pattern + ")|state=" + this.state)); | ||
this.keys(pattern, function (err, keys) { | ||
this.keys(pattern, wrap('mgetkeys-keys(pattern='+pattern+')', function (err, keys) { | ||
if (err) | ||
return next(err); | ||
$this.mget(keys, function (err, values) { | ||
$this.mget(keys, wrap('mgetkeys-mget(pattern='+pattern+')', function (err, values) { | ||
if (err) | ||
@@ -95,4 +107,4 @@ return next(err); | ||
next(null, vector); | ||
}); | ||
}); | ||
}, $this.logger, $this.meta)); | ||
}, $this.logger, $this.meta)); | ||
}; | ||
@@ -103,3 +115,3 @@ | ||
return next(new Error("redis:set(key=" + key + ", value=" + value + ")|state=" + this.state)); | ||
this.redis.set(key, value, next); | ||
this.redis.set(key, value, wrap('set(key='+key+', value='+value+')', next, this.logger, this.meta)); | ||
}; | ||
@@ -110,3 +122,3 @@ | ||
return next(new Error("redis:del(key=" + key + ")|state=" + this.state)); | ||
this.redis.del(key, next); | ||
this.redis.del(key, wrap('del(key='+key+')', next, this.logger, this.meta)); | ||
}; | ||
@@ -113,0 +125,0 @@ |
@@ -5,3 +5,3 @@ { | ||
"description": "A DNS Server with an Web UI and using Redis a configuration store", | ||
"version": "0.1.3", | ||
"version": "0.1.4", | ||
"keywords": [ | ||
@@ -19,3 +19,3 @@ "dns" | ||
"redis": "0.10.3", | ||
"tomahawk": "0.1.0", | ||
"tomahawk": "0.1.2", | ||
"winston": "0.7.2" | ||
@@ -22,0 +22,0 @@ }, |
angular.module('dnsModels', []) | ||
.factory('ConfigModel', function() { | ||
var model = { | ||
sayHello : true | ||
version : '0.0.0' | ||
}; | ||
return model; | ||
}) | ||
.factory('ToDoModel', function() { | ||
var model = { | ||
todo : [ | ||
"do one thing", | ||
"do another thing", | ||
"do nothing", | ||
"do something" | ||
] | ||
}; | ||
return model; | ||
}) | ||
; |
@@ -23,4 +23,3 @@ angular.module('dnsServices', ['ngResource']) | ||
.factory('socket', function($rootScope) { | ||
var WebDomain = document.domain, | ||
socket = io.connect(""); | ||
var socket = io.connect(''); | ||
return { | ||
@@ -27,0 +26,0 @@ on: function(eventName, callback) { |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
248154
31
572
+ Addedtomahawk@0.1.2(transitive)
- Removedtomahawk@0.1.0(transitive)
Updatedtomahawk@0.1.2