Skip to content

fix bug: error happens if no callback is set when calling client.close() #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
laike9m wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix bug: error happens if no callback is set when calling client.close() #38

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e584ac1
fix bug: error happens if no callback is set when calling client.close()
laike9m Jan 27, 2015
fe8669f
make zk-plus suppourt string and number as node value
laike9m Mar 26, 2015
5e082c5
add boolean support
laike9m Mar 31, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 28 additions & 13 deletions lib/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,9 @@ ZKClient.prototype.connect = function connect(cb) {
ZKClient.prototype.close = function close(cb) {
assert.optionalFunc(cb, 'callback');

cb = once(cb);

if (cb) {
cb = once(cb);
}
var log = this.log;
var zk = this.zk;

Expand Down Expand Up @@ -225,7 +226,7 @@ ZKClient.prototype.close = function close(cb) {

ZKClient.prototype.create = function creat(p, obj, opts, cb) {
assert.string(p, 'path');
assert.object(obj, 'object');

if (typeof (opts) === 'function') {
cb = opts;
opts = {};
Expand All @@ -240,7 +241,13 @@ ZKClient.prototype.create = function creat(p, obj, opts, cb) {
if (!this._connected(cb))
return;

var data = new Buffer(JSON.stringify(obj), 'utf8');
var data;
if (typeof(obj) === "string") {
data = new Buffer(obj, 'utf-8');
} else {
assert.object(obj, 'object');
data = new Buffer(JSON.stringify(obj), 'utf8');
}
var f;
var flags = opts.flags || [];
var log = this.log.child({
Expand Down Expand Up @@ -309,14 +316,16 @@ ZKClient.prototype.get = function get(p, cb) {
try {
obj = JSON.parse(data.toString('utf8'));
} catch (e) {
log.trace({
err: e,
data: data
}, 'get: failed (parsing data)');
cb(e);
return;
try {
obj = data.toString('utf8');
} catch (e) {
log.trace({
err: e,
data: data
}, 'get: failed (parsing data)');
return;
}
}

log.trace({data: obj}, 'get: done');
cb(null, obj);
}
Expand Down Expand Up @@ -373,7 +382,7 @@ ZKClient.prototype.mkdirp = function mkdirp(p, cb) {

ZKClient.prototype.put = function put(p, obj, opts, cb) {
assert.string(p, 'path');
assert.object(obj, 'object');
// assert.object(obj, 'object');
if (typeof (opts) === 'function') {
cb = opts;
opts = {};
Expand All @@ -387,7 +396,13 @@ ZKClient.prototype.put = function put(p, obj, opts, cb) {
if (!this._connected(cb))
return;

var data = new Buffer(JSON.stringify(obj), 'utf8');
var data;
if (typeof(obj) === "string" || typeof(obj) == "number" || typeof(obj) == "boolean") {
data = new Buffer(obj.toString(), 'utf-8');
} else {
assert.object(obj, 'object');
data = new Buffer(JSON.stringify(obj), 'utf8');
}
var log = this.log.child({path: p}, true);
var ver = opts.version !== undefined ? opts.version : -1;
var zk = this.zk;
Expand Down