upgrade nan. expose log pipe fd.

This commit is contained in:
Christopher Jeffrey 2014-09-02 19:28:20 -07:00
parent e7085e2beb
commit a2437d16c8
3 changed files with 26 additions and 5 deletions

View File

@ -7,6 +7,7 @@
var net = require('net'); var net = require('net');
var EventEmitter = require('events').EventEmitter; var EventEmitter = require('events').EventEmitter;
var bitcoindjs = require('../build/Release/bitcoindjs.node'); var bitcoindjs = require('../build/Release/bitcoindjs.node');
var util = require('util');
/** /**
* Bitcoin * Bitcoin
@ -23,17 +24,39 @@ function Bitcoin(options) {
this.options = options; this.options = options;
bitcoindjs.start(function(err, status) { this.log_pipe = bitcoindjs.start(function(err, status) {
if (err) { if (err) {
self.emit('error', err); self.emit('error', err);
return; return;
} }
self.emit('open', status); self.emit('open', status);
}); });
this.log('log pipe opened: %d', this.log_pipe);
} }
Bitcoin.prototype.__proto__ = EventEmitter.prototype; Bitcoin.prototype.__proto__ = EventEmitter.prototype;
Bitcoin.prototype.log =
Bitcoin.prototype.info = function() {
if (typeof arguments[0] !== 'string') {
var out = util.inspect(arguments[0], null, 20, true);
return process.stdout.write('bitcoind: ' + out + '\n');
}
var out = util.format.apply(util, arguments);
return process.stdout.write('bitcoind: ' + out + '\n');
};
Bitcoin.prototype.error = function() {
if (typeof arguments[0] !== 'string') {
var out = util.inspect(arguments[0], null, 20, true);
return process.stderr.write('bitcoind: ' + out + '\n');
}
var out = util.format.apply(util, arguments);
return process.stderr.write('bitcoind: ' + out + '\n');
};
/** /**
* Expose * Expose
*/ */

View File

@ -17,7 +17,7 @@
"bitcoind" "bitcoind"
], ],
"dependencies": { "dependencies": {
"nan": "~1.0.0" "nan": "1.3.0"
}, },
"devDependencies": { "devDependencies": {
"mocha": "~1.16.2" "mocha": "~1.16.2"

View File

@ -177,8 +177,6 @@ NAN_METHOD(StartBitcoind) {
open_pipes(&out_pipe, &log_pipe); open_pipes(&out_pipe, &log_pipe);
// handle->Set(NanNew<String>("log_fd"), NanNew<Number>(log_pipe[1]));
uv_work_t *req_parse_logs = new uv_work_t(); uv_work_t *req_parse_logs = new uv_work_t();
async_log_data* data_parse_logs = new async_log_data(); async_log_data* data_parse_logs = new async_log_data();
data_parse_logs->out_pipe = &out_pipe; data_parse_logs->out_pipe = &out_pipe;
@ -208,7 +206,7 @@ NAN_METHOD(StartBitcoind) {
assert(status_start_node == 0); assert(status_start_node == 0);
NanReturnValue(Undefined()); NanReturnValue(NanNew<Number>(log_pipe[1]));
} }
/** /**