feat(loglevel): configurable logging verbosity

Author: missinglink

build/pbf2json.darwin-x64

@@ -7,10 +7,22 @@ var util = require('util'),
     child = require('child_process'),
     exec = path.join(__dirname, 'build', util.format( 'pbf2json.%s-%s', os.platform(), os.arch() ) );
 
-function errorHandler( name ){
+// custom log levels can be detected for lines with the format:
+// [level] message
+// supported levels (listed from least verbose to most verbose):
+// error, warn, info
+function getLogLevel( line ){
+  if( line.indexOf('[warn]') > -1 ){ return 1; }
+  if( line.indexOf('[info]') > -1 ){ return 2; }
+  return 0;
+}
+
+function errorHandler( name, level ){
   return function( data ){
     data.toString('utf8').trim().split('\n').forEach( function( line ){
-      console.error( util.format( '[%s]:', name ), line );
+      if( getLogLevel( line ) <= level ){
+        console.error( util.format( '[%s]:', name ), line );
+      }
     });
   };
 }
@@ -44,10 +56,10 @@ function createReadStream( config ){
     .pipe( decoder );
 
   // print error and exit on decoder pipeline error
-  decoder.on( 'error', errorHandler( 'decoder' ) );
+  decoder.on( 'error', errorHandler( 'decoder', config.loglevel || 0 ) );
 
   // print error and exit on stderr
-  proc.stderr.on( 'data', errorHandler( 'pbf2json' ) );
+  proc.stderr.on( 'data', errorHandler( 'pbf2json', config.loglevel || 0 ) );
 
   // terminate the process and pipeline
   decoder.kill = function(){

build/pbf2json.linux-arm

@@ -303,7 +303,7 @@ func print(d *osmpbf.Decoder, masks *BitmaskMap, db *leveldb.DB, config settings
 
 					// no ways found, skip relation
 					if len(memberWayLatLons) == 0 {
-						log.Println("denormalize failed for relation:", v.ID, "no ways found")
+						log.Println("[warn] denormalize failed for relation:", v.ID, "no ways found")
 						continue
 					}
 
@@ -321,7 +321,7 @@ func print(d *osmpbf.Decoder, masks *BitmaskMap, db *leveldb.DB, config settings
 
 						// if for any reason we failed to find a valid bounds
 						if nil == wayBounds {
-							log.Println("failed to calculate bounds for relation member way")
+							log.Println("[warn] failed to calculate bounds for relation member way")
 							continue
 						}
 
@@ -337,7 +337,7 @@ func print(d *osmpbf.Decoder, masks *BitmaskMap, db *leveldb.DB, config settings
 
 					// if for any reason we failed to find a valid bounds
 					if nil == bounds {
-						log.Println("denormalize failed for relation:", v.ID, "no valid bounds")
+						log.Println("[warn] denormalize failed for relation:", v.ID, "no valid bounds")
 						continue
 					}
 
@@ -350,7 +350,7 @@ func print(d *osmpbf.Decoder, masks *BitmaskMap, db *leveldb.DB, config settings
 
 			default:
 
-				log.Fatalf("unknown type %T\n", v)
+				log.Fatalf("[error] unknown type %T\n", v)
 
 			}
 		}
@@ -503,7 +503,7 @@ func cacheLookupNodes(db *leveldb.DB, way *osmpbf.Way) ([]map[string]string, err
 
 		data, err := db.Get([]byte(stringid), nil)
 		if err != nil {
-			log.Println("denormalize failed for way:", way.ID, "node not found:", stringid)
+			log.Println("[warn] denormalize failed for way:", way.ID, "node not found:", stringid)
 			return make([]map[string]string, 0), err
 		}
 
@@ -521,7 +521,7 @@ func cacheLookupWayNodes(db *leveldb.DB, wayid int64) ([]map[string]string, erro
 	// look up way bytes
 	reldata, err := db.Get([]byte(stringid), nil)
 	if err != nil {
-		log.Println("lookup failed for way:", wayid, "noderefs not found:", stringid)
+		log.Println("[warn] lookup failed for way:", wayid, "noderefs not found:", stringid)
 		return make([]map[string]string, 0), err
 	}