@@ -30,11 +30,6 @@ component
3030 */
3131 property name = " cookieName"
3232
33- /**
34- * The collection of request profilers we track in the debugger
35- */
36- property name = " profilers" type = " array"
37-
3833 /**
3934 * The debugger configuration struct
4035 */
@@ -98,7 +93,11 @@ component
9893 " coldboxName" : variables .controller .getColdBoxSettings ().codename ,
9994 " coldboxVersion" : variables .controller .getColdBoxSettings ().version ,
10095 " coldboxSuffix" : variables .controller .getColdBoxSettings ().suffix ,
101- " coldboxModules" : variables .controller .getModuleService ().getLoadedModules ()
96+ " appName" : variables .controller .getSetting ( " appName"
97+ " appPath" : variables .controller .getSetting ( " applicationPath"
98+ " appHash" : variables .controller .getAppHash (),
99+ " dockerHost" : ( isNull ( cgi .local_host ) ? " " : cgi .local_host ),
100+ " dockerIp" : ( isNull ( cgi .local_addr ) ? " 0.0.0.0" : cgi .local_addr )
102101 };
103102
104103 // Initialize secret key
@@ -107,6 +106,13 @@ component
107106 return this ;
108107 }
109108
109+ /**
110+ * Get the cache region configured for the debugger
111+ */
112+ private function getCacheRegion (){
113+ return variables .controller .getCacheBox ().getCache ( variables .debuggerConfig .requestTracker .cacheName );
114+ }
115+
110116 /**
111117 * I generate a secret key value for the cookie which enables debug mode
112118 */
@@ -221,14 +227,42 @@ component
221227 return request .cbDebugger ;
222228 }
223229
230+ /**
231+ * Get the key used in the off heap storage
232+ */
233+ function getStorageKey (){
234+ return " cbDebugger-#variables .environment .appName .replace ( " " " -" " all" "
235+ }
236+
224237 /**
225238 * Reset the request tracking profilers
226239 */
227240 DebuggerService function resetProfilers (){
228- variables .profilers = [];
241+ if ( variables .debuggerConfig .requestTracker .storage eq " cachebox"
242+ getCacheRegion ().set ( getStorageKey (), [], 0 , 0 );
243+ } else {
244+ variables .profilers = [];
245+ }
229246 return this ;
230247 }
231248
249+ /**
250+ * Get the profiler storage array depending on the storage options
251+ */
252+ array function getProfilerStorage (){
253+ if ( variables .debuggerConfig .requestTracker .storage eq " cachebox"
254+ return getCacheRegion ().getOrSet (
255+ getStorageKey (),
256+ function (){
257+ return [];
258+ },
259+ 0
260+ );
261+ } else {
262+ return variables .profilers ;
263+ }
264+ }
265+
232266 /**
233267 * Record a profiler and it's timers internally
234268 *
@@ -241,9 +275,14 @@ component
241275 required executionTime ,
242276 exception = {}
243277 ){
278+ var targetStorage = getProfilerStorage ();
279+
244280 // size check, if passed, pop one
245- if ( arrayLen ( variables .profilers ) gte variables .debuggerConfig .requestTracker .maxProfilers ) {
246- popProfiler ();
281+ if ( arrayLen ( targetStorage ) gte variables .debuggerConfig .requestTracker .maxProfilers ) {
282+ arrayDeleteAt (
283+ targetStorage ,
284+ arrayLen ( targetStorage )
285+ );
247286 }
248287
249288 // Build out the exception data to trace if any?
@@ -306,11 +345,14 @@ component
306345 { requestTracker : request .cbDebugger }
307346 );
308347
309- // New Profiler record to store into the stack
310- arrayPrepend (
311- variables .profilers ,
312- request .cbDebugger
313- );
348+ // New Profiler record to store into the singleton stack
349+ arrayPrepend ( targetStorage , request .cbDebugger );
350+
351+ // Are we using cache storage
352+ if ( variables .debuggerConfig .requestTracker .storage eq " cachebox"
353+ // store indefintely using the debugger and app hash
354+ getCacheRegion ().set ( getStorageKey (), targetStorage , 0 , 0 );
355+ }
314356
315357 return this ;
316358 }
@@ -323,7 +365,7 @@ component
323365 * @return The profiler requested or an empty struct if not found
324366 */
325367 struct function getProfilerById ( required id ){
326- return variables . profilers
368+ return getProfilerStorage ()
327369 .filter ( function ( thisItem ){
328370 return arguments .this Item .id .toString () == id ;
329371 } )
@@ -333,17 +375,6 @@ component
333375 }, {} );
334376 }
335377
336- /**
337- * Pop a profiler record from the top
338- */
339- DebuggerService function popProfiler (){
340- arrayDeleteAt (
341- variables .profilers ,
342- arrayLen ( variables .profilers )
343- );
344- return this ;
345- }
346-
347378 /**
348379 * Push a new tracer into the debugger. This comes from LogBox, so we follow
349380 * the same patterns
0 commit comments