Martin Peřina has uploaded a new change for review.
Change subject: core: Fix logging messages
......................................................................
core: Fix logging messages
Fix logging messages:
1. Use message formatting instead of string concatenation
2. Use ' for possibly empty formatted values
3. Fix typos
Change-Id: I4ed6791198b43c427bb2843a6cdd8f7519bed891
Signed-off-by: Martin Perina <mper...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandEntityCleanupManager.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetProviderCertificateChainQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUnregisteredDisksQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SignStringQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StartVdsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsDirector.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryResult.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsByStorageDomainQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java
M
backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/OpenSSHUtils.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/HostMonitoring.java
12 files changed, 43 insertions(+), 36 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/36639/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandEntityCleanupManager.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandEntityCleanupManager.java
index 9e0ee04..71d286b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandEntityCleanupManager.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandEntityCleanupManager.java
@@ -23,7 +23,7 @@
}
private CommandEntityCleanupManager() {
- log.info("Start initializing " + getClass().getSimpleName());
+ log.info("Start initializing {}", getClass().getSimpleName());
Calendar calendar = new GregorianCalendar();
Date mCommandEntityCleanupTime = Config.<DateTime>
getValue(ConfigValues.CommandEntityCleanupTime);
calendar.setTimeInMillis(mCommandEntityCleanupTime.getTime());
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java
index f3769d3..19417a1 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java
@@ -95,7 +95,7 @@
@Override
protected void executeCommand() {
- log.info("Power-Management: " + getAction() + " of Host " +
getVdsName() + " initiated.");
+ log.info("Power-Management: {} of host '{}' initiated.", getAction(),
getVdsName());
audit(AuditLogType.FENCE_OPERATION_STARTED);
VDSStatus lastStatus = getVds().getStatus();
VDSFenceReturnValue result = null;
@@ -104,10 +104,10 @@
result = fence();
handleResult(result);
if (getSucceeded()) {
- log.info("Power-Management: " + getAction() + " Host " +
getVdsName() + " succeeded.");
+ log.info("Power-Management: {} host '{}' succeeded.",
getAction(), getVdsName());
audit(AuditLogType.FENCE_OPERATION_SUCCEEDED);
} else {
- log.info("Power-Management: " + getAction() + " Host " +
getVdsName() + " failed.");
+ log.info("Power-Management: {} host '{}' failed.",
getAction(), getVdsName());
audit(AuditLogType.FENCE_OPERATION_FAILED);
}
} finally {
@@ -200,7 +200,7 @@
FenceExecutor fenceExecutor = createFenceExecutor();
VDSFenceReturnValue fenceExecutionResult =
fenceExecutor.fence(getAction(), fenceAgent);
if (wasSkippedDueToStatus(fenceExecutionResult)) {
- log.info("Attemp to {} VDS using fence agent{} skipped: Host is
already at the requested state.",
+ log.info("Attemp to {} host using fence agent '{}' skipped, host
is already at the requested state.",
getAction().name().toLowerCase(),
fenceAgent.getId());
}
@@ -228,7 +228,7 @@
private void logAgentFailure(final VDSFenceReturnValue result) {
if (!wasSkippedDueToPolicy(result)) {
- log.error("Failed to {} VDS using fence agent {} (if other agents
are running, {} may still succeed).",
+ log.error("Failed to {} host using fence agent {} (if other agents
are running, {} may still succeed).",
getAction().name().toLowerCase(),
result.getFenceAgentUsed().getId() == null ? "New Agent
(no ID)" : result.getFenceAgentUsed()
.getId(),
@@ -266,7 +266,7 @@
boolean requiredStatusReached = false;
String requiredStatus = getRequiredStatus();
String hostName = getVds().getName();
- log.info("Waiting for vds {} to reach status {}", hostName,
requiredStatus);
+ log.info("Waiting for host '{}' to reach status '{}'", hostName,
requiredStatus);
// Waiting before first attempt to check the host status.
// This is done because if we will attempt to get host status
immediately
// in most cases it will not turn from on/off to off/on and we will
need
@@ -274,7 +274,7 @@
ThreadUtils.sleep(SLEEP_BEFORE_FIRST_ATTEMPT);
int retries = getWaitForStatusRerties();
while (!requiredStatusReached && i <= retries) {
- log.info("Attempt {} to get vds {} status", i, hostName);
+ log.info("Attempt {} to get host '{}' status", i, hostName);
VDSFenceReturnValue returnValue = executor.checkStatus();
if (returnValue != null && returnValue.getSucceeded()) {
String status = ((FenceStatusReturnValue)
returnValue.getReturnValue()).getStatus();
@@ -286,14 +286,14 @@
j++;
} else {
// No need to retry , agent definitions are corrupted
- log.error("Host {} PM Agent definitions are corrupted,
aborting fence operation.", hostName);
+ log.error("Host '{}' PM Agent definitions are
corrupted, aborting fence operation.", hostName);
break;
}
}
else {
if (requiredStatus.equalsIgnoreCase(status)) {
requiredStatusReached = true;
- log.info("vds {} status is {}", hostName,
requiredStatus);
+ log.info("Host '{}' status is '{}'", hostName,
requiredStatus);
} else {
i++;
if (i <= retries) {
@@ -302,7 +302,7 @@
}
}
} else {
- log.error("Failed to get host {} status.", hostName);
+ log.error("Failed to get host '{}' status.", hostName);
break;
}
}
@@ -318,7 +318,7 @@
auditLogable.addCustomValue("Status", actionName);
auditLogable.setVdsId(getVds().getId());
AuditLogDirector.log(auditLogable,
AuditLogType.VDS_ALERT_FENCE_STATUS_VERIFICATION_FAILED);
- log.error("Failed to verify host {} {} status. Have retried {} times
with delay of {} seconds between each retry.",
+ log.error("Failed to verify host '{}' {} status. Have retried {} times
with delay of {} seconds between each retry.",
getVds().getName(),
getAction().name(),
getWaitForStatusRerties(),
@@ -346,7 +346,8 @@
}
String agentIds = builder.toString();
agentIds = agentIds.substring(0, agentIds.length() - 2);
- log.error("Failed to {} VDS using fence agents {} concurrently: ",
+ log.error("Failed to {} host using fence agents '{}' concurrently: {}",
+ action.name(),
agentIds,
result.getExceptionString());
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetProviderCertificateChainQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetProviderCertificateChainQuery.java
index 883d474..ae871af 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetProviderCertificateChainQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetProviderCertificateChainQuery.java
@@ -45,8 +45,8 @@
getQueryReturnValue().setReturnValue(results);
}
} catch (Exception e) {
- log.error("Error in encoding certificate. Error is {} " +
e.getMessage());
- log.debug("Exeption:", e);
+ log.error("Error in encoding certificate: {}", e.getMessage());
+ log.debug("Exception", e);
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUnregisteredDisksQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUnregisteredDisksQuery.java
index b9a08ae..26d8c51 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUnregisteredDisksQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUnregisteredDisksQuery.java
@@ -55,7 +55,7 @@
if (unregQueryReturn.getSucceeded()) {
unregisteredDisks.add(unregQueryReturn.<Disk>getReturnValue());
} else {
- log.debug("Could not get populated disk, reason: " +
unregQueryReturn.getExceptionString());
+ log.debug("Could not get populated disk: {}",
unregQueryReturn.getExceptionString());
}
}
getQueryReturnValue().setReturnValue(unregisteredDisks);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SignStringQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SignStringQuery.java
index 3ceb146..3d88482 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SignStringQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SignStringQuery.java
@@ -20,7 +20,8 @@
getQueryReturnValue().setSucceeded(true);
} catch (Exception e) {
- log.error("Error when signing string: " + e.getMessage());
+ log.error("Error when signing string: {}", e.getMessage());
+ log.debug("Exception", e);
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StartVdsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StartVdsCommand.java
index 5739f87..73dbb53 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StartVdsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StartVdsCommand.java
@@ -87,8 +87,10 @@
break;
}
} catch (ExecutionException | InterruptedException e) {
- log.warn("Attempt to start host: " + getVdsName()
- + " using one of its agents has failed.", e);
+ log.warn("Attempt to start host '{}' using one of its agents
has failed: {}",
+ getVdsName(),
+ e.getMessage());
+ log.debug("Exception", e);
}
}
if (result != null && !result.getSucceeded()) {
@@ -99,13 +101,14 @@
private void cancelFutureTasks(List<Future<VDSFenceReturnValue>> futures,
Guid agentId) {
if (!futures.isEmpty()) {
- log.info("Start of host: " + getVdsName()
- + " succeeded using fencing agent: " + agentId
- + ", canelling concurrent attempts by other agents to
start the host");
+ log.info("Start of host '{}' succeeded using fencing agent '{}',"
+ + " cancelling concurrent attempts by other agents
to start the host",
+ getVdsName(),
+ agentId);
}
for (Future<VDSFenceReturnValue> future : futures) {
try {
- log.info("Cancelling agent: " +
future.get().getFenceAgentUsed().getId());
+ log.info("Cancelling agent '{}' ",
future.get().getFenceAgentUsed().getId());
} catch (InterruptedException | ExecutionException e) {
// do nothing
}
@@ -136,7 +139,7 @@
addCanDoActionMessage(VdcBllMessages.VDS_FENCE_OPERATION_FAILED);
addCanDoActionMessage(VdcBllMessages.VAR__TYPE__HOST);
addCanDoActionMessage(VdcBllMessages.VAR__ACTION__START);
- log.error("Failed to run StartVdsCommand on vds '{}'", getVdsName());
+ log.error("Failed to run StartVdsCommand on host '{}'", getVdsName());
}
@Override
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsDirector.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsDirector.java
index 1051a27..04099df 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsDirector.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsDirector.java
@@ -59,7 +59,7 @@
*/
protected void init() {
- log.info("Start initializing " + getClass().getSimpleName());
+ log.info("Start initializing {}", getClass().getSimpleName());
tagsMapByID.clear();
tagsMapByName.clear();
Tags root = new Tags("root", null, true, ROOT_TAG_ID, "root");
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryResult.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryResult.java
index cc03115..1de211d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryResult.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryResult.java
@@ -52,8 +52,9 @@
String customPropertiesRegex = singleModule[1].toString();
if (!StringUtils.isEmpty(customPropertiesRegex) &&
SimpleCustomPropertiesUtil.getInstance()
.syntaxErrorInProperties(customPropertiesRegex)) {
- log.error("module " + moduleName + " will not be
loaded, wrong custom properties format ("
- + customPropertiesRegex + ")");
+ log.error("Module '{}' will not be loaded, wrong
custom properties format ({})",
+ moduleName,
+ customPropertiesRegex);
continue;
}
ExternalSchedulerDiscoveryUnit currentUnit = new
ExternalSchedulerDiscoveryUnit(moduleName,
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsByStorageDomainQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsByStorageDomainQuery.java
index e0de273..92821ba 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsByStorageDomainQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsByStorageDomainQuery.java
@@ -55,8 +55,9 @@
getQueryReturnValue().setReturnValue(vms);
}
else {
- log.error("Failed to retrieve disks by storage domain id " +
domainId + " due to exception "
- + queryReturnValue.getExceptionString());
+ log.error("Failed to retrieve disks by storage domain id '{}': {}",
+ domainId,
+ queryReturnValue.getExceptionString());
getQueryReturnValue().setSucceeded(false);
getQueryReturnValue().setExceptionString(queryReturnValue.getExceptionString());
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java
index 5a91dab..2d0396f 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java
@@ -302,7 +302,7 @@
boolean isDisconnectSucceeded =
runVdsCommand(VDSCommandType.DisconnectStorageServer,
connectionParametersForVdsm).getSucceeded();
if (!isDisconnectSucceeded) {
- log.warn("Failed to disconnect storage connection " +
getConnection());
+ log.warn("Failed to disconnect storage connection {}",
getConnection());
}
}
diff --git
a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/OpenSSHUtils.java
b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/OpenSSHUtils.java
index 3a92b59..1faccec 100644
---
a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/OpenSSHUtils.java
+++
b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/OpenSSHUtils.java
@@ -35,7 +35,7 @@
public static byte[] getKeyBytes(final PublicKey key) {
// We only support RSA at the moment:
if (!(key instanceof RSAPublicKey)) {
- log.error("The key algorithm \"" + key.getAlgorithm() + "\" is not
supported, will return null.");
+ log.error("The key algorithm '{}' is not supported, will return
null.", key.getAlgorithm());
return null;
}
@@ -109,7 +109,7 @@
final Base64 encoder = new Base64(0);
final String encoding = encoder.encodeToString(keyBytes);
if (log.isDebugEnabled()) {
- log.debug("Key encoding is \"{}\".", encoding);
+ log.debug("Key encoding is '{}'.", encoding);
}
// Return the generated SSH public key:
@@ -124,7 +124,7 @@
buffer.append('\n');
final String keyString = buffer.toString();
if (log.isDebugEnabled()) {
- log.debug("Key string is \"{}\".", keyString);
+ log.debug("Key string is '{}'.", keyString);
}
return keyString;
@@ -138,7 +138,7 @@
*/
public static final byte[] getKeyFingerprintBytes(final PublicKey key) {
if (key == null) {
- log.error("Public key is null, failed to retreive fingerprint.");
+ log.error("Public key is null, failed to retrieve fingerprint.");
return null;
}
@@ -186,7 +186,7 @@
}
final String fingerprintString = buffer.toString();
if (log.isDebugEnabled()) {
- log.debug("Fingerprint string is \"{}\".", fingerprintString);
+ log.debug("Fingerprint string is '{}'.", fingerprintString);
}
return fingerprintString;
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/HostMonitoring.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/HostMonitoring.java
index be50327..73484ca 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/HostMonitoring.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/HostMonitoring.java
@@ -485,7 +485,7 @@
checkVdsInterfaces();
if (Config.<Boolean> getValue(ConfigValues.DebugTimerLogging)) {
- log.debug("vds::refreshVdsStats\n{0}", this);
+ log.debug("vds::refreshVdsStats\n{}", this);
}
}
--
To view, visit http://gerrit.ovirt.org/36639
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ed6791198b43c427bb2843a6cdd8f7519bed891
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Martin Peřina <mper...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
