Add cache hit to the log, per request from Cloudflare

Author: zachleat

sample.js

@@ -14,34 +14,34 @@ const AssetCache = saveLocal.AssetCache;
 	// don’t await here to test concurrency
 	let first = saveLocal("https://www.zachleat.com/img/avatar-2017-big.png", options);
 	promises.push(first);
-	
-	let second = saveLocal("https://www.zachleat.com/img/avatar-2017-big.png", options);
-	promises.push(second);
-
-	promises.push(saveLocal("https://www.zachleat.com/web/css/fonts/lato/2.0/LatoLatin-Regular.ttf", options));
-
-	let json = saveLocal("https://opencollective.com/11ty/members/all.json", {
-		duration: options.duration,
-		type: "json"
-	});
-	promises.push(json);
-
-	let asset = new AssetCache("twitter-followers-eleven_ty");
-	if(asset.isCacheValid("4d")) {
-		console.log( "Found cached value" );
-		console.log( await asset.getCachedValue() );
-	} else {
-		console.log( "Saving value" );
-		asset.save({ followers: 42 }, "json");
-	}
-	
+
+	// let second = saveLocal("https://www.zachleat.com/img/avatar-2017-big.png", options);
+	// promises.push(second);
+
+	// promises.push(saveLocal("https://www.zachleat.com/web/css/fonts/lato/2.0/LatoLatin-Regular.ttf", options));
+
+	// let json = saveLocal("https://opencollective.com/11ty/members/all.json", {
+	// 	duration: options.duration,
+	// 	type: "json"
+	// });
+	// promises.push(json);
+
+	// let asset = new AssetCache("twitter-followers-eleven_ty");
+	// if(asset.isCacheValid("4d")) {
+	// 	console.log( "Found cached value" );
+	// 	console.log( await asset.getCachedValue() );
+	// } else {
+	// 	console.log( "Saving value" );
+	// 	asset.save({ followers: 42 }, "json");
+	// }
+
 	await Promise.all(promises);
-	
-	console.log( JSON.stringify(await json).substr(0, 100), "… (truncated)" );
-	
+
+	// console.log( JSON.stringify(await json).substr(0, 100), "… (truncated)" );
+
 	console.log( process.cpuUsage(startCpu) );
 	console.log( os.freemem() / (1024 * 1024), os.totalmem() / (1024 * 1024) );
 	// console.log( process.memoryUsage() );
 	// console.log( process.resourceUsage() );
-	
+
 })();

src/RemoteAssetCache.js

@@ -35,7 +35,7 @@ class RemoteAssetCache extends AssetCache {
 
 	log(message) {
 		if(this.options.verbose) {
-			console.log(message);
+			console.log(`[11ty/eleventy-fetch] ${message}`);
 		} else {
 			debug(message);
 		}
@@ -63,12 +63,13 @@ class RemoteAssetCache extends AssetCache {
 		// Important: no disk writes when dryRun
 		// As of Fetch v4, reads are now allowed!
 		if(super.isCacheValid(duration) ) {
+			this.log( `Using cached version of: ${this.displayUrl}` );
 			return super.getCachedValue();
 		}
 
 		try {
 			let isDryRun = optionsOverride.dryRun || this.options.dryRun;
-			this.log( `[11ty/eleventy-fetch] ${isDryRun? "Fetching" : "Caching"}: ${this.displayUrl}` );
+			this.log( `${isDryRun? "Fetching" : "Caching"}: ${this.displayUrl}` );
 
 			let fetchOptions = optionsOverride.fetchOptions || this.options.fetchOptions || {};
 			let response = await fetch(this.url, fetchOptions);
@@ -84,8 +85,8 @@ class RemoteAssetCache extends AssetCache {
 			return body;
 		} catch(e) {
 			if(this.cachedObject) {
-				this.log( `[11ty/eleventy-fetch] Error fetching ${this.displayUrl}. Message: ${e.message}`);
-				this.log( `[11ty/eleventy-fetch] Failing gracefully with an expired cache entry.` );
+				this.log( `Error fetching ${this.displayUrl}. Message: ${e.message}`);
+				this.log( `Failing gracefully with an expired cache entry.` );
 				return super.getCachedValue();
 			} else {
 				return Promise.reject(e);