Skip to content

Commit

Permalink
Merge branch '6.0' into LDEV-4278
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattdyer
mattdyer committed Jul 20, 2023
2 parents 51b7613 + 23986d4 commit 665bf62
Show file tree
Hide file tree
Showing 23 changed files with 593 additions and 207 deletions.
14 changes: 8 additions & 6 deletions core/src/main/cfml/context/admin/chartProcess.cfm
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
<cfset pool['HEAP']="Heap">
<cfset pool['NON_HEAP']="Non-Heap">
<cfif isNull(stText)>
<cfset stText = ( application.stText[ session.lucee_admin_lang ] )?:application.stText.en>
</cfif>

<cffunction name="printMemory" returntype="struct">
<cfargument name="usage" type="query" required="yes">
<cfargument name="showTitle" type="boolean" default="true" required="false">

<cfset var used=evaluate(ValueList(arguments.usage.used,'+'))>
<cfset var max=evaluate(ValueList(arguments.usage.max,'+'))>
<cfset var init=evaluate(ValueList(arguments.usage.init,'+'))>
<cfset var qry=QueryNew(arguments.usage.columnlist)>
<cfset QueryAddRow(qry)>
<cfset QuerySetCell(qry,"type",arguments.usage.type)>
<cfset QuerySetCell(qry,"name",variables.pool[arguments.usage.type])>
<cfset QuerySetCell(qry,"name",stText?.Overview?.pool[arguments.usage.type])>
<cfset QuerySetCell(qry,"init",init,qry.recordcount)>
<cfset QuerySetCell(qry,"max",max,qry.recordcount)>
<cfset QuerySetCell(qry,"used",used,qry.recordcount)>
<cfset arguments.usage=qry>
<cfif arguments.showTitle><b>#pool[usage.type]#</b></cfif>
<cfif arguments.showTitle><b>#stText?.Overview?.pool[usage.type]#</b></cfif>
<cfset var str = {}>
<cfloop query="arguments.usage">
<cfset str.pused=int(100/arguments.usage.max*arguments.usage.used)>
Expand All @@ -29,8 +31,8 @@

<cffunction name="sysMetric" returnType="struct" access="remote" localmode="modern">
<cfset systemInfo=GetSystemMetrics()>
<cfset heap = variables.printMemory(getmemoryUsage("heap"),false)>
<cfset nonHeap = variables.printMemory(getmemoryUsage("non_heap"),false)>
<cfset heap = variables.printMemory(getmemoryUsage("HEAP"),true)>
<cfset nonHeap = variables.printMemory(getmemoryUsage("NON_HEAP"),true)>
<cfset cpuSystemData = int((systemInfo.cpuSystem ?: 0) *100)>
<cfset cpuProcessData= int((systemInfo.cpuProcess ?: 0) *100)>
<cfset result = {
Expand Down
54 changes: 2 additions & 52 deletions core/src/main/cfml/context/admin/overview.cfm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,30 +77,6 @@ Redirect to entry --->
Error Output --->
<cfset printError(error)>

<cfset pool['HEAP']="Heap">
<cfset pool['NON_HEAP']="Non-Heap">

<cfset pool['HEAP_desc']="Memory used for all objects that are allocated.">
<cfset pool['NON_HEAP_desc']="Memory used to store all cfc/cfm templates, java classes, interned Strings and meta-data.">

<cfset pool["Par Eden Space"]="The pool from which memory is initially allocated for most objects.">
<cfset pool["Par Survivor Space"]="The pool containing objects that have survived the garbage collection of the Eden space.">
<cfset pool["CMS Old Gen"]="The pool containing objects that have existed for some time in the survivor space.">
<cfset pool["CMS Perm Gen"]="The pool containing all the reflective data of the virtual machine itself, such as class and method objects.">
<cfset pool["Code Cache"]="The HotSpot Java VM also includes a code cache, containing memory that is used for compilation and storage of native code.">


<cfset pool["Eden Space"]=pool["Par Eden Space"]>
<cfset pool["PS Eden Space"]=pool["Par Eden Space"]>

<cfset pool["Survivor Space"]=pool["Par Survivor Space"]>
<cfset pool["PS Survivor Space"]=pool["Par Survivor Space"]>

<cfset pool["Perm Gen"]=pool["CMS Perm Gen"]>

<cfset pool["Tenured Gen"]=pool["CMS Old Gen"]>
<cfset pool["PS Old Gen"]=pool["CMS Old Gen"]>

<cfhtmlbody>
<script src="../res/js/echarts-all.js.cfm" type="text/javascript"></script>

Expand Down Expand Up @@ -409,32 +385,6 @@ Error Output --->
</cfif>
</cfif>




<cfset stText.Overview.modeMulti="You are in Multi Mode">
<cfset stText.Overview.modeSingle="You are in Single Mode">
<cfset stText.Overview.modeMultiDesc="You are running Lucee in Multi Mode, this means you have a single Server Administrator where you can set settings for all web contexts/webs and a Web Administrator for every single web context/web.">
<cfset stText.Overview.modeSingleDesc="You are running Lucee in Single Mode, this means you only have a single Administrator, one place where you do all your configurations for all web contexts/webs.
">

<cfset stText.Overview.modeMultiSwitch="Switch to Single Mode?">
<cfset stText.Overview.modeSingleSwitch="Switch to Multi Mode?">
<cfset stText.Overview.modeMultiSwitchDesc="You wanna activate Lucee in Single Mode, this means you only have a single Administrator, one place where you do all your configurations for all web contexts/webs.">
<cfset stText.Overview.modeSingleSwitchDesc="You wanna activate Multi Mode, mean having a Server Administrator where you can set settings for all web contexts/webs and a Web Administrator for every single web context/web, you can simply switch to Multi Mode here.">


<cfset stText.Overview.switchMerge="Merge and Switch">
<cfset stText.Overview.switchMergeDesc="All settings from all web contexts/webs get stored into the server context">
<cfset stText.Overview.switchLeave="Just Switch">
<cfset stText.Overview.switchLeaveDesc="Switch to single mode and forget all settings done in all web contexts/webs">

<cfset stText.Overview.switchKeep="keep all web context/web configuration in place, so i can go back to multi mode">


<cfset stText.Buttons.switch="Switch">


<cfif request.adminType=="server">
<form method="post">
<input type="hidden" name="adminMode" value="#request.singlemode?"multi":"single"#">
Expand Down Expand Up @@ -519,11 +469,11 @@ Error Output --->
</th>
</tr>
<tr>
<td width="50%"><b>#pool['heap']#</b> <span id="heap-label" style="padding-left:10px;"></span>
<td width="50%"><b>#stText.Overview.pool['HEAP']#</b> <span id="heap-label" style="padding-left:10px;"></span>
<div id="heap" style="min-width: 100px; height: 150px; margin: 0 auto;"></div>

</td>
<td width="50%"><b>#pool['non_heap']#</b><span id="nonheap-label" style="padding-left:10px;"></span><br>
<td width="50%"><b>#stText.Overview.pool['NON_HEAP']#</b><span id="nonheap-label" style="padding-left:10px;"></span><br>
<div id="nonheap" style="min-width: 100px; height: 150px; margin: 0 auto;"></div>

</td>
Expand Down
33 changes: 29 additions & 4 deletions core/src/main/cfml/context/admin/resources/language/de.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
"stop": "stop",
"stopstart": "stop/start",
"submit": "senden",
"switch": "**switch",
"uninstall": "deinstallieren",
"update": "aktualisieren",
"updateFull": "Update als Vollversion",
Expand Down Expand Up @@ -247,7 +248,7 @@
"label": "Label",
"labelMissing": "you need to define the label for the debug template",
"list": {
"createDesc": "define a debug template, to show the debug information at the end of a request, defining a template is not necessary to log the debug information.",
"createDesc": "Define a debug template to show the debug information at the end of a request. Defining a template is not necessary to log the debug information.",
"serverTitle": "Readonly Debug Templates",
"serverTitleDesc": "Readonly debug templates are generated within the \"server administrator\" for all web instances and can not be modified by the \"web administrator\".",
"webTitle": "Debug Templates",
Expand Down Expand Up @@ -616,7 +617,7 @@
"servermissing": "Bitte geben Sie einen Wert für den Mailserver an.",
"settings": "Mail Einstellungen",
"spoolenabled": "Spooler an",
"SpoolEnabledDesc": "If enabled the mails are sent in a background thread and the main request does not have to wait until the mails are sent.",
"SpoolEnabledDesc": "If enabled, the mails are sent in a background thread and the main request does not have to wait until the mails are sent.",
"spoolinterval": "Spool Intervall",
"ssl": "SSL",
"sslDesc": "Sichere Verbindung verwenden.",
Expand Down Expand Up @@ -809,11 +810,35 @@
"mailinglist": "Mailingliste",
"mailinglist_de": "Mailinglist (deutsch)",
"mailinglistDesc": "The mailing list is the focus of our community support program - help for users by users. ",
"modeMulti": "**You are in Multi Mode",
"modeSingle": "**You are in Single Mode",
"modeMultiDesc": "**You are running Lucee in Multi Mode. In Multi Mode, you use the Server Administrator to configure overall settings for all web contexts/webs, and use individual Web Administrators to customize settings for each web context/web.",
"modeSingleDesc": "**You are running Lucee in Single Mode. In Single Mode, you use a single Administrator to configure settings for all web contexts/webs. No individual Web Administrators exist.",
"modeMultiSwitch": "**Switch to Single Mode?",
"modeSingleSwitch": "**Switch to Multi Mode?",
"modeMultiSwitchDesc": "**Activating Single Mode will result in having a single Administrator to configure settings for all web contexts/webs. No individual Web Administrators will exist.",
"modeSingleSwitchDesc": "**Activating Multi Mode will result in having a Server Administrator to configure overall settings for all web contexts/webs and individual Web Administrators to customize settings for each web context/web.",
"switchMerge": "**Merge and Switch",
"switchMergeDesc": "**All settings from all web contexts/webs get stored into the server context",
"switchLeave": "**Just Switch",
"switchLeaveDesc": "**Switch to Single Mode and forget all settings done in all web contexts/webs",
"switchKeep": "**Keep all web context/web configuration in place so a return to Multi Mode is possible",
"onlineDocsDesc": "Lucee online documentation.",
"onlineDocsLink": "Online Documentation",
"os": "Betriebssystem",
"pool": {
"HEAP": "Heap",
"NON_HEAP": "Non-Heap",
"HEAP_desc": "**Memory used for all objects that are allocated.",
"NON_HEAP_desc": "**Memory used to store all cfc/cfm templates, java classes, interned Strings and meta-data.",
"Par Eden Space": "**The pool from which memory is initially allocated for most objects.",
"Par Survivor Space": "**The pool containing objects that have survived the garbage collection of the Eden space.",
"CMS Old Gen": "**The pool containing objects that have existed for some time in the survivor space.",
"CMS Perm Gen": "**The pool containing all the reflective data of the virtual machine itself, such as class and method objects.",
"Code Cache": "**The HotSpot Java VM also includes a code cache, containing memory that is used for compilation and storage of native code."
},
"professional": "Professional support",
"professionalDesc": "For many organizations and individuals, the security of a formal paid support contract is a necessity and we\u0027re pleased to offer four standard packages as well as the flexibility to create a custom package should your needs go beyond our standard offerings.",
"professionalDesc": "For many organizations and individuals, the security of a formal paid support contract is a necessity. We are pleased to offer four standard packages as well as the flexibility to create a custom package should your needs go beyond our standard offerings.",
"purchase": "Hol Dir Deine Lucee Lizenz",
"releasedate": "Release Datum",
"remote_addr": "Remote IP",
Expand Down Expand Up @@ -1331,7 +1356,7 @@
"allowCompression": "Kompression",
"allowCompressionDescription": "Kompression (GZip) für den Response Stream einschalten, sofern dies vom Client (Browser) unterstützt ist",
"bufferOutput": "Buffer Tag Body Output",
"bufferOutputDescription": "If true - the output written to the body of the tag is buffered and is also outputted in case of an exception. Otherwise the content to body is ignored and not displayed when a failure occurs in the body of the tag.",
"bufferOutputDescription": "If true - the output written to the body of the tag is buffered and is also outputted in case of an exception. Otherwise, the content to body is ignored and not displayed when a failure occurs in the body of the tag.",
"cacheclear": "{name} Cache leeren",
"cacheclearcount": "{name} Cache leeren ( {count} Element(e) )",
"cachecleardesc": "Drücken Sie den Button oberhalb um den {name} Cache zu leeren.",
Expand Down
Loading

0 comments on commit 665bf62

Please sign in to comment.