zcash-hackworks
/
bitcore-node-zcash
mirror of https://github.com/zcash-hackworks/bitcore-node-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

output redirection work.

This commit is contained in:
Christopher Jeffrey 2014-09-17 15:33:21 -07:00
parent e3724414d4
commit 84ea0890a8
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/bitcoind.js
View File

@ -8,6 +8,7 @@ var net = require('net');
var EventEmitter = require('events').EventEmitter;
var bitcoindjs = require('../build/Release/bitcoindjs.node');
var util = require('util');
var net = require('net');
/**
* Bitcoin
@ -98,7 +99,17 @@ Bitcoin.prototype.start = function(callback) {
}
}, 1000);
this.log('log pipe opened: %d', this.log_pipe);
if (this.log_pipe !== -1) {
this.log('log pipe opened: %d', this.log_pipe);
this._pipe = new net.Socket(this.log_pipe);
this._pipe.on('data', function(data) {
return process.stdout.write('bitcoind: ' + data + '\n');
});
this._pipe.on('error', function(err) {
; // ignore for now
});
this._pipe.resume();
}
};
Bitcoin.prototype.log =

20
src/bitcoindjs.cc
View File

@ -416,8 +416,8 @@ const char bitcoind_char[256] = {
static void
open_pipes(int **out_pipe, int **log_pipe) {
pipe(*out_pipe);
dup2(*out_pipe[1], STDOUT_FILENO);
dup2(*out_pipe[1], STDERR_FILENO);
dup2((*out_pipe)[1], STDOUT_FILENO);
dup2((*out_pipe)[1], STDERR_FILENO);
pipe(*log_pipe);
}
@ -427,11 +427,11 @@ parse_logs(int **out_pipe, int **log_pipe) {
ssize_t r = 0;
size_t rcount = 80 * sizeof(char);
char *buf = (char *)malloc(rcount);
char cur[10];
char cur[13];
unsigned int cp = 0;
unsigned int reallocs = 0;
while ((r = read(*out_pipe[0], buf + rtotal, rcount))) {
while ((r = read((*out_pipe)[0], buf, rcount))) {
unsigned int i;
char *rbuf;
@ -444,7 +444,7 @@ parse_logs(int **out_pipe, int **log_pipe) {
if (r <= 0) continue;
// Grab the buffer at the start of the bytes that were read:
rbuf = (char *)(buf + r);
rbuf = (char *)(buf + rtotal);
// If these are our logs, write them to stdout:
for (i = 0; i < r; i++) {
@ -459,8 +459,8 @@ parse_logs(int **out_pipe, int **log_pipe) {
ssize_t w = 0;
ssize_t wtotal = 0;
// undo redirection
close(*out_pipe[0]);
close(*out_pipe[1]);
close((*out_pipe)[0]);
close((*out_pipe)[1]);
w = write(STDOUT_FILENO, cur, cp);
wtotal += w;
while ((w = write(STDOUT_FILENO, rbuf + i + wtotal, wcount))) {
@ -474,8 +474,8 @@ parse_logs(int **out_pipe, int **log_pipe) {
}
// reopen redirection
pipe(*out_pipe);
dup2(*out_pipe[1], STDOUT_FILENO);
dup2(*out_pipe[1], STDERR_FILENO);
dup2((*out_pipe)[1], STDOUT_FILENO);
dup2((*out_pipe)[1], STDERR_FILENO);
break;
} else if (cp == sizeof cur - 1) {
cp = 0;
@ -490,7 +490,7 @@ parse_logs(int **out_pipe, int **log_pipe) {
size_t wcount = r;
ssize_t w = 0;
ssize_t wtotal = 0;
while ((w = write(*log_pipe[1], rbuf + i + wtotal + 1, wcount))) {
while ((w = write((*log_pipe)[1], rbuf + i + wtotal + 1, wcount))) {
if (w == -1) {
fprintf(stderr, "bitcoind.js: error=\"parse_logs(): bad write.\"\n");
sleep(1);