Changeset 1592
- Timestamp:
- 07/01/08 00:36:29 (3 months ago)
- Files:
-
- coldbox/trunk/system/coldbox.cfc (modified) (1 diff)
- coldbox/trunk/system/extras/ColdboxProxy.cfc (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
coldbox/trunk/system/coldbox.cfc
r1578 r1592 211 211 </cftry> 212 212 213 <!--- Request Profilers --->214 <cfif cbController.getDebuggerService().getDebuggerConfigBean().getPersistentRequestProfiler() and215 structKeyExists(request,"debugTimers")>216 <cfset cbController.getDebuggerService().pushProfiler(request.DebugTimers)>217 </cfif>218 219 213 <!--- DebugMode Routines ---> 220 214 <cfif cbController.getDebuggerService().getDebugMode()> 215 <!--- Request Profilers ---> 216 <cfif cbController.getDebuggerService().getDebuggerConfigBean().getPersistentRequestProfiler() and 217 structKeyExists(request,"debugTimers")> 218 <cfset cbController.getDebuggerService().pushProfiler(request.DebugTimers)> 219 </cfif> 221 220 <!--- Render DebugPanel ---> 222 221 <cfif Event.getdebugpanelFlag()> coldbox/trunk/system/extras/ColdboxProxy.cfc
r1575 r1592 28 28 29 29 try{ 30 //Create the request context 30 /* Trace the incoming arguments. */ 31 tracer('Process: Incoming arguments',arguments); 32 33 /* Create the request context */ 31 34 Event = cbController.getRequestService().requestCapture(); 32 35 … … 67 70 } 68 71 catch(Any e){ 69 / /Log Exception72 /* Log Exception */ 70 73 cbController.getExceptionService().ExceptionHandler(e,"coldboxproxy","Process Exception"); 74 71 75 /* Verify stacktrace */ 72 76 if( not structKeyExists(e,"stacktrace") ){ 73 77 e.stacktrace = ""; 74 78 } 79 75 80 /* Request Profilers */ 76 pushTimers(cbController); 77 81 pushTimers(); 78 82 /* Custom throw. */ 79 83 throwit(e.message.toString(),e.detail.toString() & e.stacktrace.toString()); … … 81 85 82 86 /* Request Profilers */ 83 pushTimers( cbController);84 85 / /Determine what to return via the setting87 pushTimers(); 88 89 /* Determine what to return via the setting */ 86 90 if ( cbController.getSetting("ProxyReturnCollection") ){ 87 / /Return request collection91 /* Return request collection */ 88 92 return Event.getCollection(); 89 93 } … … 91 95 /* Check for Marshalling */ 92 96 if ( not structisEmpty(Event.getRenderData()) ){ 93 returngetPlugin("Utilities").marshallData(argumentCollection=Event.getRenderData());94 } 95 / /Return results from handler only if found, else method will produce a null result97 local.results = getPlugin("Utilities").marshallData(argumentCollection=Event.getRenderData()); 98 } 99 /* Return results from handler only if found, else method will produce a null result */ 96 100 if( structKeyExists(local,"results") ){ 101 /* Trace the results */ 102 tracer('Process: Outgoing Results',local.results); 103 /* Return The results */ 97 104 return local.results; 98 105 } 106 else{ 107 /* Trace the results */ 108 tracer('No outgoing results found in the local scope.'); 109 } 99 110 } 100 111 </cfscript> … … 117 128 interceptionStructure.interceptData = arguments.interceptData; 118 129 119 //Intercept 130 /* Trace the incoming arguments */ 131 tracer('AnnounceInterception: incoming arguments',arguments); 132 133 /* Intercept */ 120 134 try{ 121 135 cbController.getInterceptorService().processState(arguments.state,interceptionStructure); … … 125 139 cbController.getExceptionService().ExceptionHandler(e,"coldboxproxy","Interception Exception"); 126 140 /* Request Profilers */ 127 pushTimers( cbController);141 pushTimers(); 128 142 /* Return */ 129 143 return false; … … 131 145 132 146 /* Request Profilers */ 133 pushTimers( cbController);147 pushTimers(); 134 148 135 149 /* Return */ … … 140 154 <!------------------------------------------- PRIVATE -------------------------------------------> 141 155 156 <!--- Trace messages to the tracer panel ---> 157 <cffunction name="tracer" access="private" returntype="void" hint="Trace messages to the tracer panel, will only trace if in debug mode." output="false" > 158 <!--- ************************************************************* ---> 159 <cfargument name="message" type="string" required="Yes" hint="Message to Send" > 160 <cfargument name="ExtraInfo" required="No" default="" type="any" hint="Extra Information to dump on the trace"> 161 <!--- ************************************************************* ---> 162 <cfscript> 163 var cbController = getController(); 164 165 if( cbController.getDebuggerService().getDebugMode() ){ 166 cbController.getPlugin("logger").tracer(argumentCollection=arguments); 167 } 168 </cfscript> 169 </cffunction> 170 142 171 <!--- Push Timers ---> 143 172 <cffunction name="pushTimers" access="private" returntype="void" hint="Push timers into debugging stack" output="false" > 144 <cfargument name="cbController" required="true" type="any" hint="the coldbox controller"> 145 <cfscript> 146 var dService = arguments.cbController.getDebuggerService(); 147 148 /* Request Profilers */ 149 if ( dService.getDebuggerConfigBean().getPersistentRequestProfiler() and 150 structKeyExists(request,"debugTimers") ){ 151 /* Push timers */ 152 dService.pushProfiler(request.DebugTimers); 173 <cfscript> 174 var cbController = getController(); 175 var dService = cbController.getDebuggerService(); 176 177 /* Only push if in debug mode. */ 178 if( cbController.getDebuggerService().getDebugMode() ){ 179 /* Request Profilers */ 180 if ( dService.getDebuggerConfigBean().getPersistentRequestProfiler() and structKeyExists(request,"debugTimers") ){ 181 /* Push timers */ 182 dService.pushProfiler(request.DebugTimers); 183 } 153 184 } 154 185 </cfscript>
