Merge branch 'development'

Author: lmajano

ModuleConfig.cfc

@@ -101,14 +101,14 @@ component {
 			modules  : { enabled : false, expanded : false },
 			// Quick and QB Reporting
 			qb       : {
-				enabled   : true,
+				enabled   : false,
 				expanded  : false,
 				// Log the binding parameters
 				logParams : true
 			},
 			// cborm Reporting
 			cborm : {
-				enabled   : true,
+				enabled   : false,
 				expanded  : false,
 				// Log the binding parameters
 				logParams : true

box.json

@@ -2,11 +2,11 @@
     "name":"ColdBox Debugger",
     "author":"Ortus Solutions <[email protected]",
     "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbdebugger/@build.version@/[email protected]@.zip",
-    "version":"3.0.0",
+    "version":"3.1.0",
     "slug":"cbdebugger",
     "type":"modules",
     "homepage":"https://github.com/coldbox-modules/cbdebugger",
-    "bugs":"https://github.com/coldbox-modules/cbdebugger/issues",
+    "bugs":"https://ortussolutions.atlassian.net/browse/CBDEBUGGER",
     "documentation":"https://github.com/coldbox-modules/cbdebugger",
     "repository":{
         "type":"git",

changelog.md

@@ -7,7 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ----
 
-## [3.0.0]
+## [3.1.0] => 2021-MAy-19
+
+### Fixed
+
+* Fix wrong cborm reference on QBCollector
+* Look at the renderdata content type instead of type as it's more consistent in order to turn off the debugger on multi-marshalled sites
+* [CBDEBUGGER-1] - Lucee debugger no longer shows below the cbDebugger. Turn off only on Ajax Calls
+
+### Changed
+
+* Use Java property for version to work with jdk8+
+* [CBDEBUGGER-2] - Made `cborm` and `qb` disabled by default
+
+----
+
+## [3.0.0] => 2021-APR-07
 
 ### Added
 

handlers/Main.cfc

@@ -21,8 +21,10 @@ component extends="coldbox.system.RestHandler" {
 		// Global params
 		event.paramValue( "frequency", 0 ).paramValue( "isVisualizer", false );
 
-		// Don't show cf debug
-		cfsetting( showdebugoutput = "false" );
+		// Don't show cf debug on ajax calls
+		if( event.isAjax() ){
+			cfsetting( showdebugoutput = "false" );
+		}
 
 		// If not enabled, just 404 it
 		if ( !variables.debuggerService.getDebugMode() ) {

interceptors/QBCollector.cfc

@@ -52,7 +52,7 @@ component extends="coldbox.system.Interceptor" {
 		var logData = {
 			"timestamp"     : arguments.interceptData.timestamp,
 			"sql"           : arguments.interceptData.sql,
-			"params"        : variables.debuggerConfig.cborm.logParams ? arguments.interceptData.bindings : [],
+			"params"        : variables.debuggerConfig.qb.logParams ? arguments.interceptData.bindings : [],
 			"options"       : arguments.interceptData.options,
 			"executionTime" : arguments.interceptData.executionTime,
 			"caller"        : variables.debuggerService.discoverCallingStack( "get", "QueryBuilder" )

interceptors/RequestCollector.cfc

@@ -100,7 +100,7 @@ component extends="coldbox.system.Interceptor" {
 			// Has it not been disabled by the user programmatically
 			arguments.event.getPrivateValue( "cbox_debugger_show", true ) AND
 			// We don't have any render data OR the render data is HTML
-			( structIsEmpty( arguments.event.getRenderData() ) || arguments.event.getRenderData().type == "HTML" ) AND
+			( structIsEmpty( arguments.event.getRenderData() ) || arguments.event.getRenderData().contentType == "text/html" ) AND
 			// Don't render in ajax calls
 			!arguments.event.isAjax() AND
 			// Don't render in testing mode

models/DebuggerService.cfc

@@ -85,7 +85,7 @@ component
 		variables.environment = {
 			"cfmlEngine"          : server.coldfusion.productName,
 			"cfmlVersion"         : ( server.keyExists( "lucee" ) ? server.lucee.version : server.coldfusion.productVersion ),
-			"javaVersion"         : variables.jvmRuntime.version().toString(),
+			"javaVersion"         : createObject( "java", "java.lang.System" ).getProperty( "java.version" ),
 			"totalMemory"         : variables.jvmRuntime.totalMemory(),
 			"maxMemory"           : variables.jvmRuntime.maxMemory(),
 			"availableProcessors" : variables.jvmRuntime.availableProcessors(),

readme.md

@@ -28,9 +28,10 @@ Apache License, Version 2.0.
 
 ## Important Links
 
-- https://github.com/coldbox-modules/cbox-debugger
-- https://www.forgebox.io/view/cbdebugger
-- https://community.ortussolutions.com/c/box-modules/cbdebugger/38
+- Source: https://github.com/coldbox-modules/cbox-debugger
+- ForgeBox: https://www.forgebox.io/view/cbdebugger
+- Community: https://community.ortussolutions.com/c/box-modules/cbdebugger/38
+- Issues: https://ortussolutions.atlassian.net/browse/CBDEBUGGER
 - [Changelog](changelog.md)
 
 ## System Requirements
@@ -86,6 +87,8 @@ moduleSettings = {
 		debugPassword  : "cb:null",
 		// Request Tracker Options
 		requestTracker : {
+			// Track all cbdebugger events, by default this is off, turn on, when actually profiling yourself :) How Meta!
+			trackDebuggerEvents          : false,
 			// Store the request profilers in heap memory or in cachebox, default is cachebox
 			storage                      : "cachebox",
 			// Which cache region to store the profilers in
@@ -149,7 +152,7 @@ moduleSettings = {
 		cborm : {
 			enabled   : true,
 			expanded  : false,
-			// Log the binding parameters
+			// Log the binding parameters (requires CBORM 3.2.0+)
 			logParams : true
 		},
 		// Async Manager Reporting
@@ -177,12 +180,12 @@ This module will also register a few methods in all your handlers/interceptors/l
 
 ```js
 	/**
-	 * Method to turn on the rendering of the debug panel on a reqquest
+	 * Method to turn on the rendering of the debug panel on a request
 	 */
 	any function showDebugger()
 
 	/**
-	 * Method to turn off the rendering of the debug panel on a reqquest
+	 * Method to turn off the rendering of the debug panel on a request
 	 */
 	any function hideDebugger()
 
@@ -371,12 +374,14 @@ We have a dedicated panel in the debugger that will track all criteria queries a
 cborm : {
 	enabled   : true,
 	expanded  : false,
-	// Log the binding parameters
+	// Log the binding parameters (requires CBORM 3.2.0+)
 	logParams : true
 }
 ```
 
-You can also select to `logParams` and we will track the original executable parameters of the query so you can debug the actual values of these executions.  We will also track from WHERE in the application the sql execution came from and you can even open the file to that specific line number using our code editor integrations by clicking our **open in editor** buttons.
+You can also enable `logParams` and we will track the original executable parameters of the query so you can debug the actual values of these executions.  We will also track from WHERE in the application the sql execution came from and you can even open the file to that specific line number using our code editor integrations by clicking our **open in editor** buttons.
+
+> **Note**: CBDebugger's `cborm.logParams` setting requires CBORM 3.2.0 or higher.
 
 The grouped view you see above will give you an aggregate look of all the sql calls made during the request and their frequency of execution.  It will also give you a mini report of those specific sql groups with data about where the query originated from in your source code and the binding parameters, if activated.