RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log: start parse_logs() in separate thread. handle errors.

Browse Source
This commit is contained in:
Christopher Jeffrey 2014-09-02 19:13:33 -07:00
parent c0c523f11a
commit e7085e2beb
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/index.js
View File

@ -7,5 +7,5 @@ bitcoind.on('error', function(err) {
}); });
bitcoind.on('open', function(status) { bitcoind.on('open', function(status) {
console.log('bitcoind: status=%s', status); console.log('bitcoind: status="%s"', status);
}); });

18
src/bitcoindjs.cc
View File

@ -340,6 +340,14 @@ parse_logs(int **out_pipe, int **log_pipe) {
unsigned int i; unsigned int i;
char *rbuf; char *rbuf;
if (r == -1) {
fprintf(stderr, "bitcoind: error=\"parse_logs(): bad read.\"\n");
sleep(1);
continue;
}
if (r <= 0) continue;
// Grab the buffer at the start of the bytes that were read: // Grab the buffer at the start of the bytes that were read:
rbuf = (char *)(buf + r); rbuf = (char *)(buf + r);
@ -361,6 +369,11 @@ parse_logs(int **out_pipe, int **log_pipe) {
w = write(STDOUT_FILENO, cur, cp); w = write(STDOUT_FILENO, cur, cp);
wtotal += w; wtotal += w;
while ((w = write(STDOUT_FILENO, rbuf + i + wtotal, wcount))) { while ((w = write(STDOUT_FILENO, rbuf + i + wtotal, wcount))) {
if (w == -1) {
fprintf(stderr, "bitcoind: error=\"parse_logs(): bad write.\"\n");
sleep(1);
break;
}
if (w == 0 || (size_t)wtotal == rcount) break; if (w == 0 || (size_t)wtotal == rcount) break;
wtotal += w; wtotal += w;
} }
@ -384,6 +397,11 @@ parse_logs(int **out_pipe, int **log_pipe) {
ssize_t w = 0; ssize_t w = 0;
ssize_t wtotal = 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: error=\"parse_logs(): bad write.\"\n");
sleep(1);
break;
}
if (w == 0 || (size_t)wtotal == rcount) break; if (w == 0 || (size_t)wtotal == rcount) break;
wtotal += w; wtotal += w;
} }