Skip to content

Commit 593a287

Browse files
committed
more wip
1 parent 51b1250 commit 593a287

2 files changed

Lines changed: 13 additions & 16 deletions

File tree

system/exceptions/Whoops.cfm

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ An enhanced error reporting and debugging tool for ColdBox Framework
5656
};
5757
5858
// Build framework snapshot
59-
local.frameworkSnapshot = {
60-
"Session ID" : "Session Scope Not Enabled",
59+
local.serverInfo = {
6160
"Template Path" : CGI.CF_TEMPLATE_PATH,
6261
"Path Info" : CGI.PATH_INFO,
6362
"Host" : CGI.HTTP_HOST,
@@ -67,7 +66,6 @@ An enhanced error reporting and debugging tool for ColdBox Framework
6766
"Browser" : CGI.HTTP_USER_AGENT,
6867
"Remote Address" : CGI.REMOTE_ADDR,
6968
"itemorder" : [
70-
"Session ID",
7169
"Template Path",
7270
"Path Info",
7371
"Host",
@@ -92,7 +90,6 @@ An enhanced error reporting and debugging tool for ColdBox Framework
9290
if ( structKeyExists( session, "CFToken" ) ) fwString &= "<br/>CFToken=" & session.CFToken;
9391
if ( structKeyExists( session, "sessionID" ) ) fwString &= "<br/>JSessionID=" & session.sessionID;
9492
}
95-
frameworkSnapshot[ "Session ID" ] = fwString;
9693
}
9794
9895
// Database Info
@@ -361,11 +358,11 @@ An enhanced error reporting and debugging tool for ColdBox Framework
361358
<a
362359
class="button eventdetails"
363360
href="javascript:void(0);"
364-
onclick="filterScopes( this, 'eventdetails' );">❌ Error Details</a>
361+
onclick="filterScopes( this, 'eventdetails' );">❌ Error</a>
365362
<a
366-
class="button frameworksnapshot_scope"
363+
class="button serverinfo_scope"
367364
href="javascript:void(0);"
368-
onclick="filterScopes( this, 'frameworksnapshot_scope' );">🏗️ Framework Snapshot</a>
365+
onclick="filterScopes( this, 'serverinfo_scope' );">🏗️ Server info</a>
369366
<a
370367
class="button database_scope"
371368
href="javascript:void(0);"
@@ -397,7 +394,7 @@ An enhanced error reporting and debugging tool for ColdBox Framework
397394
<a
398395
class="button stacktrace_scope"
399396
href="javascript:void(0);"
400-
onclick="filterScopes( this, 'stacktrace_scope' );">📚 Raw Stack Trace</a>
397+
onclick="filterScopes( this, 'stacktrace_scope' );">📚 Stacktrace</a>
401398
</div>
402399
</div>
403400

@@ -411,9 +408,9 @@ An enhanced error reporting and debugging tool for ColdBox Framework
411408
#oException.displayScope( eventDetails )#
412409
</div>
413410

414-
<div id="frameworksnapshot_scope" class="data-table">
415-
<label>Framework Snapshot</label>
416-
#oException.displayScope( frameworkSnapshot )#
411+
<div id="serverinfo_scope" class="data-table">
412+
<label>Server Info</label>
413+
#oException.displayScope( serverInfo )#
417414
</div>
418415

419416
<div id="database_scope" class="data-table">
@@ -458,16 +455,16 @@ An enhanced error reporting and debugging tool for ColdBox Framework
458455

459456
<div id="stacktrace_scope" class="data-table">
460457
<label title="Copy to clipboard">
461-
Raw Stack Trace
458+
Stacktrace
462459
<i
463-
onclick="copyToClipboard( 'rawStacktrace' )"
460+
onclick="copyToClipboard( 'stacktrace' )"
464461
data-eva="clipboard"
465462
data-eva-fill="white"
466463
data-eva-height="16"
467464
style="cursor: pointer"></i>
468465
</label>
469466

470-
<div id="rawStacktrace" class="data-stacktrace">#oException.processStackTrace( oException.getstackTrace() )#</div>
467+
<div id="stacktrace" class="data-stacktrace">#oException.processStackTrace( oException.getstackTrace() )#</div>
471468
</div>
472469
</div>
473470
</cfoutput>

system/web/context/ExceptionBean.cfc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,8 @@ component accessors="true" {
359359
function displayScope( required scope ){
360360
var list = createObject( "java", "java.lang.StringBuilder" ).init(
361361
"<table class="" data-table "">
362-
<tbody>
363-
"
362+
<tbody>
363+
"
364364
);
365365
var orderedArr = arguments.scope;
366366

0 commit comments

Comments
 (0)