Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-33068] Address nits
  • Loading branch information
stephenc committed Feb 22, 2016
1 parent 20926f4 commit 5f349a6
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
24 changes: 12 additions & 12 deletions core/src/main/java/hudson/model/AsyncAperiodicWork.java
Expand Up @@ -151,23 +151,23 @@ protected StreamTaskListener createListener() {
if ((lastRotateMillis + logRotateMillis < System.currentTimeMillis())
|| (logRotateSize > 0 && f.length() > logRotateSize)) {
lastRotateMillis = System.currentTimeMillis();
File p = null;
File prev = null;
for (int i = 5; i >= 0; i--) {
File o = i == 0 ? f : new File(f.getParentFile(), f.getName() + "." + i);
if (o.isFile()) {
if (p != null && !p.exists()) {
if (!o.renameTo(p)) {
File curr = i == 0 ? f : new File(f.getParentFile(), f.getName() + "." + i);
if (curr.isFile()) {
if (prev != null && !prev.exists()) {
if (!curr.renameTo(prev)) {
logger.log(getErrorLoggingLevel(), "Could not rotate log files {0} to {1}",
new Object[]{o, p});
new Object[]{curr, prev});
}
} else {
if (!o.delete()) {
if (!curr.delete()) {
logger.log(getErrorLoggingLevel(), "Could not delete log file {0} to enable rotation",
o);
curr);
}
}
}
p = o;
prev = curr;
}
}
} else {
Expand All @@ -179,10 +179,10 @@ protected StreamTaskListener createListener() {
if (!newFile.isFile()) {
// if there has never been rotation then this is the first time
if (oldFile.renameTo(newFile)) {
logger.log(getNormalLoggingLevel(), "Moved {0} to {1}.1", new Object[]{oldFile, f});
logger.log(getNormalLoggingLevel(), "Moved {0} to {1}", new Object[]{oldFile, newFile});
} else {
logger.log(getErrorLoggingLevel(), "Could not move {0} to {1}.1",
new Object[]{oldFile, f});
logger.log(getErrorLoggingLevel(), "Could not move {0} to {1}",
new Object[]{oldFile, newFile});
}
}
}
Expand Down
24 changes: 12 additions & 12 deletions core/src/main/java/hudson/model/AsyncPeriodicWork.java
Expand Up @@ -134,23 +134,23 @@ protected StreamTaskListener createListener() {
if ((lastRotateMillis + logRotateMillis < System.currentTimeMillis())
|| (logRotateSize > 0 && f.length() > logRotateSize)) {
lastRotateMillis = System.currentTimeMillis();
File p = null;
File prev = null;
for (int i = 5; i >= 0; i--) {
File o = i == 0 ? f : new File(f.getParentFile(), f.getName() + "." + i);
if (o.isFile()) {
if (p != null && !p.exists()) {
if (!o.renameTo(p)) {
File curr = i == 0 ? f : new File(f.getParentFile(), f.getName() + "." + i);
if (curr.isFile()) {
if (prev != null && !prev.exists()) {
if (!curr.renameTo(prev)) {
logger.log(getErrorLoggingLevel(), "Could not rotate log files {0} to {1}",
new Object[]{o, p});
new Object[]{curr, prev});
}
} else {
if (!o.delete()) {
if (!curr.delete()) {
logger.log(getErrorLoggingLevel(), "Could not delete log file {0} to enable rotation",
o);
curr);
}
}
}
p = o;
prev = curr;
}
}
} else {
Expand All @@ -162,10 +162,10 @@ protected StreamTaskListener createListener() {
if (!newFile.isFile()) {
// if there has never been rotation then this is the first time
if (oldFile.renameTo(newFile)) {
logger.log(getNormalLoggingLevel(), "Moved {0} to {1}.1", new Object[]{oldFile, f});
logger.log(getNormalLoggingLevel(), "Moved {0} to {1}", new Object[]{oldFile, newFile});
} else {
logger.log(getErrorLoggingLevel(), "Could not move {0} to {1}.1",
new Object[]{oldFile, f});
logger.log(getErrorLoggingLevel(), "Could not move {0} to {1}",
new Object[]{oldFile, newFile});
}
}
}
Expand Down

0 comments on commit 5f349a6

Please sign in to comment.