You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2015/07/13 17:38:31 UTC
svn commit: r1690739 - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/logging/
broker-core/src/main/resources/
broker-plugins/management-http/src/main/java/resources/
broker-plugins/management-http/src/main/java/resources/js/qpid...
Author: kwall
Date: Mon Jul 13 15:38:31 2015
New Revision: 1690739
URL: http://svn.apache.org/r1690739
Log:
QPID-6638: [Java Broker] Logger UI improvements
Work done by Lorenz Quack <qu...@gmail.com> and Keith Wall.
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelFilter.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerSyslogLogger.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelFilter.java
qpid/java/trunk/broker-core/src/main/resources/initial-config.json
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Logger.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/FileBrowser.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/syslog/add.html
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/loggerfilter/nameandlevel/add.html
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showLogger.html
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelFilter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelFilter.java?rev=1690739&r1=1690738&r2=1690739&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelFilter.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelFilter.java Mon Jul 13 15:38:31 2015
@@ -32,7 +32,7 @@ public interface BrokerNameAndLevelFilte
String LOGGER_NAME = "loggerName";
String LEVEL = "level";
- @ManagedAttribute( defaultValue = "", immutable = true )
+ @ManagedAttribute( defaultValue = "ROOT", immutable = true )
String getLoggerName();
@ManagedAttribute(defaultValue = "INFO", validValues = {"org.apache.qpid.server.logging.LogLevel#validValues()"})
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerSyslogLogger.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerSyslogLogger.java?rev=1690739&r1=1690738&r2=1690739&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerSyslogLogger.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerSyslogLogger.java Mon Jul 13 15:38:31 2015
@@ -39,7 +39,7 @@ public interface BrokerSyslogLogger<X ex
@ManagedAttribute( defaultValue = "Qpid \\(broker:${ancestor:broker:name}\\) %level [%thread] \\(%logger{2}\\) - %msg")
String getSuffixPattern();
- @ManagedAttribute( defaultValue = "\t")
+ @ManagedAttribute( defaultValue = "Qpid \\(broker:${ancestor:broker:name}\\) - ")
String getStackTracePattern();
@ManagedAttribute( defaultValue = "false")
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelFilter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelFilter.java?rev=1690739&r1=1690738&r2=1690739&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelFilter.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelFilter.java Mon Jul 13 15:38:31 2015
@@ -31,7 +31,7 @@ public interface VirtualHostNameAndLevel
String LOGGER_NAME = "loggerName";
String LEVEL = "level";
- @ManagedAttribute( defaultValue = "", immutable = true)
+ @ManagedAttribute( defaultValue = "ROOT", immutable = true)
String getLoggerName();
@ManagedAttribute(defaultValue = "INFO", validValues = {"org.apache.qpid.server.logging.LogLevel#validValues()"})
Modified: qpid/java/trunk/broker-core/src/main/resources/initial-config.json
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/resources/initial-config.json?rev=1690739&r1=1690738&r2=1690739&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/resources/initial-config.json (original)
+++ qpid/java/trunk/broker-core/src/main/resources/initial-config.json Mon Jul 13 15:38:31 2015
@@ -41,20 +41,20 @@
"maxFileSize" : "200mb",
"maxHistory" : 1,
"brokerloggerfilters" : [ {
- "name" : "1",
+ "name" : "acceptFilter1",
"type" : "NameAndLevel",
"level" : "INFO",
- "loggerName" : ""
+ "loggerName" : "ROOT"
} ]
}, {
"name" : "memory",
"type" : "Memory",
"maxRecords" : 4096,
"brokerloggerfilters" : [ {
- "name" : "1",
+ "name" : "acceptFilter1",
"type" : "NameAndLevel",
"level" : "INFO",
- "loggerName" : ""
+ "loggerName" : "ROOT"
} ]
} ],
"ports" : [ {
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js?rev=1690739&r1=1690738&r2=1690739&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js Mon Jul 13 15:38:31 2015
@@ -582,13 +582,15 @@ define(["dojo/parser",
that.brokerLoggersGrid =
new UpdatableStore(brokerLoggerData, query(".broker-loggers")[0],
[ { name: "Name", field: "name", width: "40%"},
- { name: "State", field: "state", width: "20%"},
- { name: "Type", field: "type", width: "20%"},
+ { name: "State", field: "state", width: "15%"},
+ { name: "Type", field: "type", width: "15%"},
{ name: "Exclude Virtual Host Logs", field: "virtualHostLogEventExcluded", width: "20%",
formatter: function(val){
return util.buildCheckboxMarkup(val);
}
- }
+ },
+ { name: "Errors", field: "errorCount", width: "5%"},
+ { name: "Warnings", field: "warnCount", width: "5%"}
], function(obj) {
connect.connect(obj.grid, "onRowDblClick", obj.grid,
function(evt){
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Logger.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Logger.js?rev=1690739&r1=1690738&r2=1690739&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Logger.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Logger.js Mon Jul 13 15:38:31 2015
@@ -104,10 +104,11 @@ define(["dojo/parser",
this.filterGrid = new UpdatableStore([], query(".filterGrid", containerNode)[0],
[
- {name: "Name", field: "name", width: "40%"},
+ {name: "Filter Name", field: "name", width: "20%"},
{name: "Type", field: "type", width: "20%"},
+ {name: "Logger Name", field: "loggerName", width: "30%"},
{name: "Level", field: "level", width: "20%"},
- {name: "Durable", field: "durable", width: "20%", formatter: util.buildCheckboxMarkup}
+ {name: "Durable", field: "durable", width: "10%", formatter: util.buildCheckboxMarkup}
], function (obj)
{
connect.connect(obj.grid, "onRowDblClick", obj.grid,
@@ -192,7 +193,7 @@ define(["dojo/parser",
}
}
- storeNodes(["name", "state", "type", "loggerAttributes", "loggerTypeSpecificDetails", "filterWarning", "durable"]);
+ storeNodes(["name", "state", "type", "loggerAttributes", "loggerTypeSpecificDetails", "filterWarning", "durable", "errorCount", "warnCount"]);
}
Updater.prototype.update = function (callback)
@@ -227,6 +228,8 @@ define(["dojo/parser",
this.state.innerHTML = entities.encode(String(data["state"]));
this.type.innerHTML = entities.encode(String(data["type"]));
this.durable.innerHTML = util.buildCheckboxMarkup(data["durable"]);
+ this.errorCount.innerHTML = String(data["statistics"]["errorCount"]);
+ this.warnCount.innerHTML = String(data["statistics"]["warnCount"]);
if (!this.details)
{
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js?rev=1690739&r1=1690738&r2=1690739&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js Mon Jul 13 15:38:31 2015
@@ -328,11 +328,8 @@ define(["dojo/parser",
[ { name: "Name", field: "name", width: "40%"},
{ name: "State", field: "state", width: "20%"},
{ name: "Type", field: "type", width: "20%"},
- { name: "Durable", field: "durable", width: "20%",
- formatter: function(val){
- return util.buildCheckboxMarkup(val);
- }
- }
+ { name: "Errors", field: "errorCount", width: "10%"},
+ { name: "Warnings", field: "warnCount", width: "10%"}
],
function(obj)
{
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/FileBrowser.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/FileBrowser.js?rev=1690739&r1=1690738&r2=1690739&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/FileBrowser.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/FileBrowser.js Mon Jul 13 15:38:31 2015
@@ -70,14 +70,14 @@ define(["qpid/common/util",
this.logFiles = this.addIdToFileObjects(params.data);
this.logFileGrid = new UpdatableStore(this.logFiles, query(".logFilesGrid", params.containerNode)[0],
[
- { name: "Name", field: "name", width: "auto"},
- { name: "Size", field: "size", width: "60px",
+ { name: "Name", field: "name", width: "40%"},
+ { name: "Size", field: "size", width: "20%",
formatter: function(val)
{
return val > 1024 ? (val > 1048576? number.round(val/1048576) + "MB": number.round(val/1024) + "KB") : val + "bytes";
}
},
- { name: "Last Modified", field: "lastModified", width: "250px",
+ { name: "Last Modified", field: "lastModified", width: "40%",
formatter: function(val)
{
return that.management.userPreferences.formatDateTime(val, {addOffset: true, appendTimeZone: true});
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/syslog/add.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/syslog/add.html?rev=1690739&r1=1690738&r2=1690739&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/syslog/add.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/syslog/add.html Mon Jul 13 15:38:31 2015
@@ -62,7 +62,7 @@
data-dojo-type="dijit/form/ValidationTextBox"
data-dojo-props="
name: 'stackTracePattern',
- placeHolder: '\t',
+ placeHolder: 'Qpid (<parent_name>) - ',
promptMessage: 'Enter the stack trace pattern',
title: 'Allows the customization of the string appearing just before each stack trace line'"/>
</div>
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/loggerfilter/nameandlevel/add.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/loggerfilter/nameandlevel/add.html?rev=1690739&r1=1690738&r2=1690739&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/loggerfilter/nameandlevel/add.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/loggerfilter/nameandlevel/add.html Mon Jul 13 15:38:31 2015
@@ -25,8 +25,8 @@
data-dojo-type="dijit/form/ValidationTextBox"
data-dojo-props="
name: 'loggerName',
- placeHolder: 'xxx.yyy.zzz',
- promptMessage: 'Enter logger name. .* wildcard can be specified on the end of logger name to include the logger hierarchy. if not set a root logger will be used',
+ placeHolder: 'ROOT',
+ promptMessage: 'Enter logger name (usually the package name). To capture loggers from subpackages you must specify the ".*" wildcard at the end (e.g., org.apache.qpid.*)',
title: 'Enter logger name'"/>
</div>
</div>
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showLogger.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showLogger.html?rev=1690739&r1=1690738&r2=1690739&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showLogger.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showLogger.html Mon Jul 13 15:38:31 2015
@@ -20,21 +20,33 @@
-->
<div>
<div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Logger Attributes', open: false">
- <div class="clear">
- <div class="formLabel-labelCell">Name:</div>
- <div class="name"></div>
+ <div class="alignLeft">
+ <div class="clear">
+ <div class="formLabel-labelCell">Name:</div>
+ <div class="name formValue-valueCell"></div>
+ </div>
+ <div class="clear">
+ <div class="formLabel-labelCell">Type:</div>
+ <div class="type formValue-valueCell"></div>
+ </div>
+ <div class="clear">
+ <div class="formLabel-labelCell">State:</div>
+ <div class="state formValue-valueCell"></div>
+ </div>
+ <div class="clear">
+ <div class="formLabel-labelCell">Durable:</div>
+ <div class="durable formValue-valueCell"><input type="checkbox"/></div>
+ </div>
</div>
- <div class="clear">
- <div class="formLabel-labelCell">Type:</div>
- <div class="type"></div>
- </div>
- <div class="clear">
- <div class="formLabel-labelCell">State:</div>
- <div class="state"></div>
- </div>
- <div class="clear">
- <div class="formLabel-labelCell">Durable:</div>
- <div class="durable"><input type="checkbox"/></div>
+ <div class="alignRight">
+ <div class="clear">
+ <div class="formLabel-labelCell">Error Count:</div>
+ <div class="errorCount formValue-valueCell"></div>
+ </div>
+ <div class="clear">
+ <div class="formLabel-labelCell">Warning Count:</div>
+ <div class="warnCount formValue-valueCell"></div>
+ </div>
</div>
<div class="clear loggerAttributes"></div>
<div class="clear"></div>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org