suzanne.soy/wiki.gruntnetwork.com--zimmer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logging fix, see #10

Browse Source
This commit is contained in:
v 2019-01-30 18:02:48 +03:00
parent 421ab5f05f
commit 442d6d820e
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wikizimmer.js
View File

@ -89,7 +89,7 @@ function warning ( ...args ) {
} }
function fatal ( ...args ) { function fatal ( ...args ) {
log( ...args ) console.trace( elapsedStr( startTime ), ... args )
osProcess.exit( 1 ) osProcess.exit( 1 )
} }

14
zimmer.js
View File

@ -32,7 +32,7 @@ SOFTWARE.
const packageInfo = require('./package.json'); const packageInfo = require('./package.json');
const os = require( 'os' ) const os = require( 'os' )
const osPath = require( 'path' ) const osPath = require( 'path' )
const process = require( 'process' ) const osProcess = require( 'process' )
const url = require( 'url' ) const url = require( 'url' )
const crypto = require( "crypto" ) const crypto = require( "crypto" )
@ -144,7 +144,7 @@ function mimeFromIndex ( idx ) {
function mimeTypeIndex ( mimeType ) { function mimeTypeIndex ( mimeType ) {
if ( mimeType == null ) { if ( mimeType == null ) {
console.trace( 'No mime type found', mimeType ) console.trace( 'No mime type found', mimeType )
process.exit( 1 ) osProcess.exit( 1 )
} }
if ( mimeType == REDIRECT_MIME ) if ( mimeType == REDIRECT_MIME )
return 0xffff return 0xffff
@ -185,7 +185,7 @@ function warning ( ...args ) {
} }
function fatal ( ...args ) { function fatal ( ...args ) {
log( ...args ) console.trace( elapsedStr( startTime ), ... args )
osProcess.exit( 1 ) osProcess.exit( 1 )
} }
@ -297,8 +297,7 @@ class Writer {
this.stream = fs.createWriteStream( path, { highWaterMark: 1024*1024*10 }) this.stream = fs.createWriteStream( path, { highWaterMark: 1024*1024*10 })
this.stream.once( 'open', fd => { }) this.stream.once( 'open', fd => { })
this.stream.on( 'error', err => { this.stream.on( 'error', err => {
console.trace( 'Writer error', this.stream.path, err ) fatal( 'Writer error', this.stream.path, err )
process.exit( 1 )
}) })
this.queue = genericPool.createPool( this.queue = genericPool.createPool(
@ -480,8 +479,7 @@ class ClusterPool {
if ( data == null || data.length == 0 ) if ( data == null || data.length == 0 )
return false return false
if ( !mimeType ) { if ( !mimeType ) {
console.error( 'isCompressible !mimeType', mimeType, data, id ) fatal( 'isCompressible !mimeType', mimeType, data, id )
process.exit( 1 )
} }
if ( mimeType == 'image/svg+xml' || mimeType.split( '/' )[ 0 ] == 'text' ) if ( mimeType == 'image/svg+xml' || mimeType.split( '/' )[ 0 ] == 'text' )
return true return true
@ -1580,7 +1578,7 @@ function main () {
.option( '--optimg', 'optimise images' ) .option( '--optimg', 'optimise images' )
.option( '--jpegquality <factor>', 'JPEG quality', parseInt, 60 ) .option( '--jpegquality <factor>', 'JPEG quality', parseInt, 60 )
.option( '--no-compress', "do not compress clusters" ) .option( '--no-compress', "do not compress clusters" )
.parse( process.argv ) .parse( osProcess.argv )
log( argv ) log( argv )