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 2018/02/02 12:53:07 UTC
[1/3] qpid-broker-j git commit: QPID-8081: [Broker-J] [Logback]
Defensive guard against null activeFile
Repository: qpid-broker-j
Updated Branches:
refs/heads/7.0.x 90d7b41f0 -> 87e9c7f41
QPID-8081: [Broker-J] [Logback] Defensive guard against null activeFile
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/d0736c51
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/d0736c51
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/d0736c51
Branch: refs/heads/7.0.x
Commit: d0736c518f85495ce43a9c1d480693b93eef8c70
Parents: 7d39879
Author: Keith Wall <kw...@apache.org>
Authored: Fri Feb 2 12:17:40 2018 +0000
Committer: Keith Wall <kw...@apache.org>
Committed: Fri Feb 2 12:31:56 2018 +0000
----------------------------------------------------------------------
.../apache/qpid/server/logging/logback/AppenderUtils.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0736c51/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AppenderUtils.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AppenderUtils.java b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AppenderUtils.java
index 16fd87d..2de5161 100644
--- a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AppenderUtils.java
+++ b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AppenderUtils.java
@@ -116,7 +116,7 @@ public class AppenderUtils
{
private final boolean _rollOnRestart;
private final FileSize _maxFileSize;
- private boolean _isFirst = true;
+ private volatile boolean _isFirst = true;
public DailyTriggeringPolicy(boolean isRollOnRestart, String maxFileSize)
{
@@ -141,7 +141,7 @@ public class AppenderUtils
if (_rollOnRestart && _isFirst)
{
_isFirst = false;
- if (activeFile.exists() && activeFile.length() == 0)
+ if (activeFile != null && activeFile.exists() && activeFile.length() == 0)
{
computeNextCheck();
return false;
@@ -161,7 +161,7 @@ public class AppenderUtils
{
private final boolean _rollOnRestart;
private final FileSize _maxFileSize;
- private boolean _isFirst = true;
+ private volatile boolean _isFirst = true;
public SizeTriggeringPolicy(boolean isRollOnRestart, String maxFileSize)
{
@@ -177,7 +177,7 @@ public class AppenderUtils
if (_rollOnRestart && _isFirst)
{
_isFirst = false;
- return activeFile.exists() && activeFile.length() != 0l;
+ return activeFile != null && activeFile.exists() && activeFile.length() != 0;
}
else
{
@@ -193,7 +193,7 @@ public class AppenderUtils
static class SimpleRollingPolicy extends FixedWindowRollingPolicy
{
- private int _maxFiles;
+ private final int _maxFiles;
public SimpleRollingPolicy(int maxHistory)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/3] qpid-broker-j git commit: QPID-8081: [Broker-J] Fix rolling of
log files on restart with roll daily policy
Posted by kw...@apache.org.
QPID-8081: [Broker-J] Fix rolling of log files on restart with roll daily policy
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/7d398797
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/7d398797
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/7d398797
Branch: refs/heads/7.0.x
Commit: 7d398797eb0378f5423cfc8ffef2e5b853b3750e
Parents: 90d7b41
Author: Alex Rudyy <or...@apache.org>
Authored: Thu Feb 1 14:33:11 2018 +0000
Committer: Keith Wall <kw...@apache.org>
Committed: Fri Feb 2 12:31:56 2018 +0000
----------------------------------------------------------------------
.../server/logging/logback/AppenderUtils.java | 21 ++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7d398797/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AppenderUtils.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AppenderUtils.java b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AppenderUtils.java
index af1aaae..16fd87d 100644
--- a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AppenderUtils.java
+++ b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AppenderUtils.java
@@ -126,13 +126,12 @@ public class AppenderUtils
}
@Override
- protected void computeNextCheck()
+ public void start()
{
- super.computeNextCheck();
- if (_rollOnRestart && _isFirst)
+ super.start();
+ if (_rollOnRestart)
{
- _isFirst = false;
- nextCheck = 0l;
+ nextCheck = 0L;
}
}
@@ -142,12 +141,14 @@ public class AppenderUtils
if (_rollOnRestart && _isFirst)
{
_isFirst = false;
- return activeFile.exists() && activeFile.length() != 0l;
- }
- else
- {
- return super.isTriggeringEvent(activeFile, event);
+ if (activeFile.exists() && activeFile.length() == 0)
+ {
+ computeNextCheck();
+ return false;
+ }
}
+
+ return super.isTriggeringEvent(activeFile, event);
}
public FileSize getMaxFileSize()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/3] qpid-broker-j git commit: QPID-8092: [Broker-J][Web Management
Console] Fix label for max history of file loggers
Posted by kw...@apache.org.
QPID-8092: [Broker-J][Web Management Console] Fix label for max history of file loggers
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/87e9c7f4
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/87e9c7f4
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/87e9c7f4
Branch: refs/heads/7.0.x
Commit: 87e9c7f41f88b24ae90988e20db19a3fb4ec2924
Parents: d0736c5
Author: Alex Rudyy <or...@apache.org>
Authored: Thu Feb 1 17:06:43 2018 +0000
Committer: Keith Wall <kw...@apache.org>
Committed: Fri Feb 2 12:52:54 2018 +0000
----------------------------------------------------------------------
.../management/logger/brokerlogger/file/show.js | 10 ++++++++--
.../logger/virtualhostlogger/file/show.js | 10 ++++++++--
.../main/java/resources/logger/file/add.html | 21 ++++++++++++++------
.../main/java/resources/logger/file/show.html | 3 ++-
4 files changed, 33 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/87e9c7f4/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/brokerlogger/file/show.js
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/brokerlogger/file/show.js b/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/brokerlogger/file/show.js
index 42f7996..5fa5332 100644
--- a/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/brokerlogger/file/show.js
+++ b/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/brokerlogger/file/show.js
@@ -19,10 +19,11 @@
*
*/
define(["qpid/common/util",
+ "dojo/query",
"dojo/text!logger/file/show.html",
"qpid/common/TypeTabExtension",
"qpid/management/logger/FileBrowser",
- "dojo/domReady!"], function (util, template, TypeTabExtension, FileBrowser)
+ "dojo/domReady!"], function (util, query, template, TypeTabExtension, FileBrowser)
{
function BrokerFileLogger(params)
{
@@ -39,6 +40,7 @@ define(["qpid/common/util",
"File",
params.metadata,
params.data);
+ this.containerNode = params.containerNode;
}
util.extend(BrokerFileLogger, TypeTabExtension);
@@ -47,7 +49,11 @@ define(["qpid/common/util",
{
TypeTabExtension.prototype.update.call(this, restData);
this.fileBrowser.update(restData);
- }
+ query(".maxHistoryLabel", this.containerNode)[0].style.display =
+ restData && restData['rollDaily'] ? 'none' : '';
+ query(".maxHistoryRollDailyLabel", this.containerNode)[0].style.display =
+ restData && restData['rollDaily'] ? '' : 'none';
+ };
return BrokerFileLogger;
});
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/87e9c7f4/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/show.js
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/show.js b/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/show.js
index c069858..7c8265b 100644
--- a/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/show.js
+++ b/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/show.js
@@ -19,10 +19,11 @@
*
*/
define(["qpid/common/util",
+ "dojo/query",
"dojo/text!logger/file/show.html",
"qpid/common/TypeTabExtension",
"qpid/management/logger/FileBrowser",
- "dojo/domReady!"], function (util, template, TypeTabExtension, FileBrowser)
+ "dojo/domReady!"], function (util, query, template, TypeTabExtension, FileBrowser)
{
function VirtualHostFileLogger(params)
{
@@ -39,6 +40,7 @@ define(["qpid/common/util",
"File",
params.metadata,
params.data);
+ this.containerNode = params.containerNode;
}
util.extend(VirtualHostFileLogger, TypeTabExtension);
@@ -47,7 +49,11 @@ define(["qpid/common/util",
{
TypeTabExtension.prototype.update.call(this, restData);
this.fileBrowser.update(restData);
- }
+ query(".maxHistoryLabel", this.containerNode)[0].style.display =
+ restData && restData['rollDaily'] ? 'none' : '';
+ query(".maxHistoryRollDailyLabel", this.containerNode)[0].style.display =
+ restData && restData['rollDaily'] ? '' : 'none';
+ };
return VirtualHostFileLogger;
});
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/87e9c7f4/broker-plugins/logging-logback/src/main/java/resources/logger/file/add.html
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/main/java/resources/logger/file/add.html b/broker-plugins/logging-logback/src/main/java/resources/logger/file/add.html
index a9eeee9..17beea2 100644
--- a/broker-plugins/logging-logback/src/main/java/resources/logger/file/add.html
+++ b/broker-plugins/logging-logback/src/main/java/resources/logger/file/add.html
@@ -49,11 +49,18 @@
<div class="clear">
<div class="formLabel-labelCell tableContainer-labelCell">Roll Daily:</div>
<div class="formLabel-controlCell tableContainer-valueCell">
- <input type="checkbox" id="addLogger.rollDaily"
+ <div type="checkbox" id="addLogger.rollDaily"
data-dojo-type="dijit/form/CheckBox"
data-dojo-props="
name: 'rollDaily',
- required: false"/>
+ required: false">
+ <script type="dojo/on" data-dojo-event="change" data-dojo-args="checked">
+require(["dijit/registry", "dojo/dom"], function(registry, dom){
+dom.byId("addLogger.maxHistory.label").style.display = checked ? 'none' : '';
+dom.byId("addLogger.maxHistory.label.roll_daily").style.display = checked ? '' : 'none';
+ });
+ </script>
+ </div>
<div data-dojo-type="dijit/Tooltip"
data-dojo-props="connectId: ['addLogger.rollDaily'],
label: 'If selected, files will be rolled over daily'">
@@ -89,15 +96,17 @@
</div>
</div>
<div class="clear">
- <div class="formLabel-labelCell tableContainer-labelCell">Maximum Number of Rolled Files:</div>
+ <div class="formLabel-labelCell tableContainer-labelCell">
+ <span id="addLogger.maxHistory.label">Maximum Number of Rolled Files</span>
+ <span id="addLogger.maxHistory.label.roll_daily" style="display: none">Maximum Number of Days to Keep Rolled Files</span>:</div>
<div class="formLabel-controlCell tableContainer-valueCell">
<input type="text" id="addLogger.maxHistory"
data-dojo-type="dijit/form/NumberTextBox"
data-dojo-props="
name: 'maxHistory',
- placeHolder: 'maximum number of files to keep in history',
- promptMessage: 'Enter the maximum number of files to keep in history',
- title: 'Enter the maximum number of files to keep in history'"/>
+ placeHolder: 'maximum history limit for rolled files',
+ promptMessage: 'Enter maximum history limit for rolled files',
+ title: 'Enter maximum history limit for rolled files'"/>
</div>
</div>
<div class="clear">
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/87e9c7f4/broker-plugins/logging-logback/src/main/java/resources/logger/file/show.html
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/main/java/resources/logger/file/show.html b/broker-plugins/logging-logback/src/main/java/resources/logger/file/show.html
index 49d8a87..1aac46a 100644
--- a/broker-plugins/logging-logback/src/main/java/resources/logger/file/show.html
+++ b/broker-plugins/logging-logback/src/main/java/resources/logger/file/show.html
@@ -40,7 +40,8 @@
<div class="compressOldFiles formValue-valueCell"></div>
</div>
<div class="clear">
- <div class="formLabel-labelCell">Maximum Number of Rolled Files:</div>
+ <div class="formLabel-labelCell"><span class="maxHistoryLabel">Maximum Number of Rolled Files</span>
+ <span class="maxHistoryRollDailyLabel" style="display: none">Maximum Number of Days to Keep Rolled Files</span>:</div>
<div class="maxHistory formValue-valueCell"></div>
</div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org