Skip to content

Commit

Permalink
2.1.0.8 View Single Log
Browse files Browse the repository at this point in the history
  • Loading branch information
zspitzer committed Apr 6, 2021
1 parent b2772e8 commit 828a1c3
Show file tree
Hide file tree
Showing 21 changed files with 163 additions and 123 deletions.
2 changes: 1 addition & 1 deletion box.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name":"Lucee Performance Analyzer",
"author":"Zac Spitzer",
"version":"2.1.0.7",
"version":"2.1.0.8",
"bugs":"https://github.com/zspitzer/lucee-performance-analyzer/issues",
"thumbnail": "https://raw.githubusercontent.com/zspitzer/lucee-performance-analyzer/master/build/images/logo.png",
"changelog":"",
Expand Down
10 changes: 5 additions & 5 deletions build-modern.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<description>
Build modern Extension
</description>


<import file="build-compile.xml"/>

Expand All @@ -27,7 +27,7 @@


<target name="distModern" depends="compile" description="copy source file to temp" >

<!-- Manifest of the extension -->
<echo file="${dist}/extension2/META-INF/MANIFEST.MF">Manifest-Version: 1.0
Built-Date: ${NOW}
Expand Down Expand Up @@ -83,7 +83,7 @@ cache: "[{'class':'${class}','bundleName':'${bundlename}','bundleVersion':'${bun
</fileset>
</copy>
<move failonerror="false" quiet="true"
file="${dist}/extension2/jars/lucee-extension-${codename}.jar"
file="${dist}/extension2/jars/lucee-extension-${codename}.jar"
tofile="${dist}/extension2/jars/lucee-extension-${codename}-${bundleversion}${build.number}.jar"/>
<!-- -->

Expand All @@ -95,10 +95,10 @@ cache: "[{'class':'${class}','bundleName':'${bundlename}','bundleVersion':'${bun
</copy>

<!-- Zip everything -->
<zip destfile="${dist}/modern/extension-${codename}-${bundleversion}${build.number}.lex">
<zip destfile="${dist}/extension-${codename}-${bundleversion}${build.number}.lex">
<zipfileset dir="${dist}/extension2"/>
</zip>

</target>


Expand Down
4 changes: 2 additions & 2 deletions build.number
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
#Wed Mar 31 19:15:12 CEST 2021
build.number=8
#Tue Apr 06 17:01:14 CEST 2021
build.number=9
Binary file not shown.
2 changes: 1 addition & 1 deletion index.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
request.self = ListFirst(cgi.REQUEST_URL,"?") &"?action=Plugin";
url.action = "Plugin";
url.plugin = "PerformanceAnalyzer";
request.version = DeserializeJson(FileRead("box.json")).version;
request.version = DeserializeJson(FileRead(ExpandPath(".\box.json"))).version;
request.subtitle = "";
request.title = "Lucee Performance Analyzer - #request.version#";
param name="url.pluginAction" default="analysis";
Expand Down
13 changes: 13 additions & 0 deletions server.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"jvm":{
"args":"-Djava.net.useSystemProxies=true"
},
"app":{
"cfengine":"[email protected]+162",
"serverHomeDirectory":"../lucee-perf-analzyer-server"
},
"http":{
"port":49215
},
"openBrowserURL":"http://perf-analyzer.localhost:49215/index.cfm"
}
30 changes: 15 additions & 15 deletions source/cfml/plugins/Action.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -24,41 +24,41 @@
*/
component extends="lucee.admin.plugin.Plugin" {

public void function init(required struct lang, required struct app) {
variables.renderUtils = new RenderUtils(arguments.lang, action("asset"), this.action );
public void function init( required struct lang, required struct app ) {
variables.renderUtils = new RenderUtils( arguments.lang, action( "asset" ), this.action );
variables._lang = arguments.lang;
setting showdebugoutput="true";
setting showdebugoutput = "true";
}

public function getRenderUtils(){
RenderUtils public function getRenderUtils(){
return variables.renderUtils;
}

public void function _display(required string template, required struct lang, required struct app, required struct req) {
public void function _display( required string template, required struct lang, required struct app, required struct req ) {
param name="url.xhr" default="false";
request._missing_lang = {};
var cfquery = ""; // var scoping
request.title = "Perf Analyzer";
if ( not url.xhr)
variables.renderUtils.includeCSS("style");
variables.perf = new Perf();
cfinclude(template="toolbar.cfm");
variables.renderUtils.includeCSS( "style" );
this.perf = new Perf();
cfinclude( template="toolbar.cfm" );

cfinclude(template=arguments.template);
cfinclude( template=arguments.template );

cfinclude(template="footer.cfm");
cfinclude( template="footer.cfm" );
//variables.renderUtils.warnMissingLang(request._missing_lang);
}

public function asset(struct lang, struct app, struct req) output=false {
public void function asset(struct lang, struct app, struct req) output=false {
param name="arguments.req.asset";
// dunno why, sometimes this doesn't exist and throws an error
if (not structKeyExists(variables, "renderUtils") )
variables.renderUtils = new RenderUtils(arguments.lang, action("asset"), this.action );
variables.renderUtils.returnAsset(url.asset);
variables.renderUtils = new RenderUtils( arguments.lang, action( "asset" ), this.action );
variables.renderUtils.returnAsset( arguments.req.asset );
}

public function getLang(struct lang, struct app, struct req) output=false {
url.xhr=true;
public void function getLang( struct lang, struct app, struct req ) output=false {
url.xhr = true;
}
}
2 changes: 1 addition & 1 deletion source/cfml/plugins/aborts.cfm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<cfscript>
param name="arguments.req.maxrows" default="1000";
local._total_aborts = 0;
local.aborts = variables.Perf.getLogs(arguments.req, "aborts");
local.aborts = this.Perf.getLogs(arguments.req, "aborts");
local.q = local.aborts.q
setTitle( "Aborts" );
</cfscript>
Expand Down
2 changes: 1 addition & 1 deletion source/cfml/plugins/dumps.cfm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<cfscript>
param name="arguments.req.maxrows" default="1000";
local._total_dumps = 0;
local.dumps = variables.Perf.getLogs(arguments.req, "dumps");
local.dumps = this.Perf.getLogs(arguments.req, "dumps");
local.q = local.dumps.q
setTitle( "Dumps" );
</cfscript>
Expand Down
2 changes: 1 addition & 1 deletion source/cfml/plugins/exceptions.cfm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<cfscript>
param name="arguments.req.maxrows" default="1000";
local._total_executions = 0;
local.exceptions = variables.Perf.getLogs(arguments.req, "exceptions");
local.exceptions = this.Perf.getLogs(arguments.req, "exceptions");
local.q = local.exceptions.q
setTitle( "Exceptions" );
</cfscript>
Expand Down
2 changes: 1 addition & 1 deletion source/cfml/plugins/footer.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</cfscript>
<cfoutput>
<hr>
<p>This report is based on all the debugging logs currently in memory ( #variables.perf.getRawLogCount()# logs, #variables.perf.getDebugMemUsage()# ) click column headers to sort</p>
<p>This report is based on all the debugging logs currently in memory ( #this.perf.getRawLogCount()# logs, #this.perf.getDebugMemUsage()# ) click column headers to sort</p>

<cfif hasJavaMethod(getPageContext().getConfig().getDebuggerPool(), "purge" )>
<input type="button" class="bm button submit" name="mainAction" value="Purge Logs"
Expand Down
Loading

0 comments on commit 828a1c3

Please sign in to comment.