return debug logs as json via url param (#1125)

* support returning list of debug logs as json append format=json to url * allow returning debug log as json append format=json to url * Apply suggestions from code review Co-authored-by: John Bampton <jbampton@users.noreply.github.com> Co-authored-by: John Bampton <jbampton@users.noreply.github.com>
lucee · Apr 1, 2021 · 8116b65 · 8116b65
1 parent b75a2a3
commit 8116b65
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/core/src/main/cfml/context/admin/debugging.logs.cfm b/core/src/main/cfml/context/admin/debugging.logs.cfm
@@ -147,13 +147,19 @@ Redirtect to entry --->
 
     <cfreturn (time/1000000)&" ms">
 </cffunction> 
-
-
+<cfscript>
+	param name="url.action2" default="list";
+	param name="url.format" default="";
 
-<cfparam name="url.action2" default="list">
-
-<cfif url.action2 EQ "list">
-	<cfinclude template="debugging.logs.list.cfm">
-<cfelse>
-	<cfinclude template="debugging.logs.detail.cfm">
-</cfif>
+	if (url.action2 EQ "list") {
+		if (url.format eq "json") {
+			setting showdebugoutput="false";
+			content reset="yes" type="application/json";
+			echo(serializeJson(logs));
+			abort;		
+		}
+		include template="debugging.logs.list.cfm";
+	} else {
+		include template="debugging.logs.detail.cfm";
+	}
+</cfscript>
diff --git a/core/src/main/cfml/context/admin/debugging.logs.detail.cfm b/core/src/main/cfml/context/admin/debugging.logs.detail.cfm
@@ -52,6 +52,13 @@
 			log=el;
 		}
 	}
+	
+	if (url.format eq "json") {
+		setting showdebugoutput="false";
+		content reset="yes" type="application/json";
+		echo(serializeJson(log));
+		abort;		
+	}
 </cfscript>
 <cfoutput>
 	<cfif !isSimpleValue(log) && structCount(drivers)>