suzanne.soy/shields
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Store raster badges in the LRU cache

Browse Source 
In ef1a5159, the switch to using imagemagick made a faulty use of the library by
listening for an 'end' event that is never raised. As a result, the cache was
never populated.

In d985f81f, a fix that takes care of the fact that the previously mentioned
dead code relies on a non-existent variable caused it to kill the server when a
raster badge is requested twice, as what it stored in the cache was the pipe
transmitting chunks, not the chunks themselves, and the pipe (a Socket object)
cannot be subsequently sent through a pipe. The following error occured instead:

    events.js:163
          throw er; // Unhandled 'error' event
          ^

    TypeError: Invalid non-string/buffer chunk
        at chunkInvalid (_stream_readable.js:395:10)
        at readableAddChunk (_stream_readable.js:150:12)
        at DataStream.Readable.push (_stream_readable.js:136:10)
        at DataStream._read (/home/m/shields/lib/svg-to-img.js:45:21)
        at DataStream.Readable.read (_stream_readable.js:350:10)
        at resume_ (_stream_readable.js:739:12)
        at _combinedTickCallback (internal/process/next_tick.js:80:11)
        at process._tickDomainCallback (internal/process/next_tick.js:128:9)
This commit is contained in:
Thaddee Tyl 2017-04-05 13:23:18 +02:00
parent 6e07fd0098
commit 2d71e844a2
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/svg-to-img.js
View File

@ -20,13 +20,10 @@ module.exports = function (svg, format, out, cb) {
.background(format === 'jpg' ? '#FFFFFF' : 'none') .background(format === 'jpg' ? '#FFFFFF' : 'none')
.flatten() .flatten()
.stream(format, function (err, stdout, stderr) { .stream(format, function (err, stdout, stderr) {
if (err) { console.error(err); } if (err) { console.error(err); return; }
var chunks = [];
stdout.on('end', function () { stdout.on('data', function(chunk) { chunks.push(chunk); });
imgCache.set(cacheIndex, [stdout]); stdout.on('end', function() { imgCache.set(cacheIndex, chunks); });
cb && cb();
});
stdout.pipe(out); stdout.pipe(out);
}); });
}; };
@ -42,9 +39,9 @@ function DataStream(data) {
util.inherits(DataStream, Readable); util.inherits(DataStream, Readable);
DataStream.prototype._read = function() { DataStream.prototype._read = function() {
while (this.i < this.data.length) { while (this.i < this.data.length) {
var stop = this.push(this.data[this.i]); var keepPushing = this.push(this.data[this.i]);
this.i++; this.i++;
if (stop) { return; } if (!keepPushing) { return; }
} }
this.push(null); this.push(null);
}; };