better logging [skip travis]

Author: rweigel

lib/metadata.js

@@ -21,14 +21,15 @@ function ishapi(json, schema, subschema, force) {
 
 	var v = is.HAPIJSON(json,schema,subschema);
 	if (v.error) {
+		//JSON.stringify(json,null,4)
 		console.log(ds() + clc.red("Invalid HAPI " + json.HAPI + " " 
-					+ subschema + " node:\n") + JSON.stringify(json,null,4));
+						 + subschema + " node.\n"));
 		console.log(clc.red("Error(s):"));
 		console.log(clc.red(v.got));
 		if (force) { 
-			console.log("\nStarting server with invalid HAPI because --ignore command-line option used.");
+			console.log("\n" + clc.yellow("Starting server with invalid HAPI because --ignore command-line option used."));
 		} else {
-			console.log("\nUse the --ignore command-line option to force start the server when metadata is not schema-valid.");
+			console.log("\n" + clc.yellow("Use the --ignore command-line option to force start the server when metadata is not schema-valid."));
 			process.exit(1);
 		}
 	}
@@ -427,6 +428,7 @@ function updatemetadata(exit_if_fail, FORCE_START, json, cb) {
 		// Resolve info nodes and checks catalog and info.
 
 		let id = xcatalog[ds_num].id;
+		console.log(ds() + "Working on dataset " + id);
 
 		metadata.cache[catalogid]['ids'].push(id);
 
@@ -447,9 +449,9 @@ function updatemetadata(exit_if_fail, FORCE_START, json, cb) {
 		}
 
 		function checkcat() {
-			if (FORCE_START) {
-				console.log(ds() + "Checking /catalog response metadata for " + catalogid);
-			}
+			//if (FORCE_START) {
+			console.log(ds() + "Checking /catalog response metadata for " + catalogid);
+			//}
 			//console.log(catalog)
 			ishapi(catalog, json["HAPI"], 'catalog', FORCE_START);
 			//console.log(catalog)
@@ -471,7 +473,6 @@ function updatemetadata(exit_if_fail, FORCE_START, json, cb) {
 
 			// Resolve JSON refs in info. 
 			let info_resolved = resolve(info);
-
 			ishapi(info_resolved, json["HAPI"], 'info', FORCE_START);		
 
 			metadata.cache[catalogid]['info'][id] = info;
@@ -498,12 +499,12 @@ exports.metadata = metadata;
 function prepmetadata(FILES, FORCE_START, VERIFIER, PLOTSERVER, cb) {	
 
 	if (FILES.length == 0) {
-		console.log(ds() + clc.green('Metadata preparation complete.'));
+		console.log(ds() + 'Metadata preparation for all servers complete.');
 		cb();
 		return;
 	} 
 
-	console.log(ds() + clc.green('Preparing metadata.'));
+	console.log(ds() + clc.green('Preparing metadata in ' + FILES[0]));
 
 	let serverfile = FILES[0];
 
@@ -516,7 +517,7 @@ function prepmetadata(FILES, FORCE_START, VERIFIER, PLOTSERVER, cb) {
 			console.log(ds() + clc.red("Did not find " + file + ". Exiting."));
 			process.exit(1);
 		}
-		console.log(ds() + "Reading " + file);
+		console.log(ds() + "Start reading, parsing, and resolving " + file);
 		try {
 			var str = fs.readFileSync(file);
 		} catch (ex) {
@@ -605,17 +606,9 @@ function prepmetadata(FILES, FORCE_START, VERIFIER, PLOTSERVER, cb) {
 	// Capabilities
 	var capabilitiesfile = ROOT + "/conf/capabilities.json";
 	var capabilities = {};
-	if (!fs.existsSync(capabilitiesfile)) {
-		// Create response in case that capabilities.json file was removed.
-		capabilities["outputFormats"] = ["csv","binary","json"];
-		console.log(ds() + "Did not find " + capabilitiesfile.replace(ROOT,"") 
-					+ ". Using " + capabilities["outputFormats"]);
-	} else {
-		capabilities = readandparse(capabilitiesfile);
-	}
+	capabilities["outputFormats"] = ["csv","binary","json"];
 	capabilities["HAPI"]   = json["HAPI"];
 	capabilities["status"] = json["status"];
-
 	metadata.cache[catalogid]['capabilities'] = capabilities;
 
 	// Sync function; will throw error or warning.
@@ -716,7 +709,6 @@ function prepmetadata(FILES, FORCE_START, VERIFIER, PLOTSERVER, cb) {
 		}, update_seconds*1000);
 	}
 
-	console.log(ds() + "Start reading, parsing, and resolving metdata.");
 	updatemetadata(true, FORCE_START, json, (err) => {
 		if (json.data.testcommands !== undefined) {
 			test.commands0(json.data.testcommands,catalogid,true);