Eli Mesika has uploaded a new change for review. Change subject: core:there are dos end of lines in engine.log ......................................................................
core:there are dos end of lines in engine.log Removing the '\r\n' from the message. Change-Id: I73eae1a3d76ffca00089ace3e9fc371950da30ff Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1015052 Signed-off-by: Eli Mesika <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/CreateImageVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/CreateSnapshotVDSCommand.java 2 files changed, 24 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/83/20983/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/CreateImageVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/CreateImageVDSCommand.java index 24389ce..6834fb7 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/CreateImageVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/CreateImageVDSCommand.java @@ -17,19 +17,18 @@ setReturnValue(Guid.Empty); log.info("-- executeIrsBrokerCommand: calling 'createVolume' with two new parameters: description and UUID"); - log.infoFormat("-- createVolume parameters:" + "\r\n" + " sdUUID={0}" - + "\r\n" + " spUUID={1}" + "\r\n" + " imgGUID={2}" - + "\r\n" + " size={3} bytes" + "\r\n" - + " volFormat={4}" + "\r\n" + " volType={5}" + "\r\n" - + " volUUID={6}" + "\r\n" - + " descr={7}" + "\r\n" + " srcImgGUID={8}" + "\r\n" - + " srcVolUUID={9}" + "\r\n" + " ", - getParameters().getStorageDomainId().toString(), getParameters() - .getStoragePoolId().toString(), getParameters().getImageGroupId() - .toString(), getParameters().getImageSizeInBytes(), - getParameters().getVolumeFormat().name(), getParameters() - .getImageType().name(), getParameters().getNewImageID().toString(), getParameters() - .getNewImageDescription(), Guid.Empty.toString(), Guid.Empty.toString()); + log.infoFormat( + "-- createVolume parameters: sdUUID={0} spUUID={1} imgGUID={2} size={3} bytes olFormat={4} volType={5} volUUID={6} descr={7} srcImgGUID={8} srcVolUUID={9}", + getParameters().getStorageDomainId().toString(), + getParameters().getStoragePoolId().toString(), + getParameters().getImageGroupId().toString(), + getParameters().getImageSizeInBytes(), + getParameters().getVolumeFormat().name(), + getParameters().getImageType().name(), + getParameters().getNewImageID().toString(), + getParameters().getNewImageDescription(), + Guid.Empty.toString(), + Guid.Empty.toString()); // NOTE: The 'uuidReturn' variable will contain the taskID and not the // created image id! diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/CreateSnapshotVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/CreateSnapshotVDSCommand.java index 720ccce..98b5422 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/CreateSnapshotVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/CreateSnapshotVDSCommand.java @@ -17,21 +17,18 @@ setReturnValue(Guid.Empty); log.info("-- executeIrsBrokerCommand: calling 'createVolume' with two new parameters: description and UUID"); - log.infoFormat("-- createVolume parameters:" + "\r\n" + " sdUUID={0}" - + "\r\n" + " spUUID={1}" + "\r\n" + " imgGUID={2}" - + "\r\n" + " size={3} bytes" + "\r\n" - + " volFormat={4}" + "\r\n" + " volType={5}" + "\r\n" - + " volUUID={6}" + "\r\n" - + " descr={7}" + "\r\n" + " srcImgGUID={8}" + "\r\n" - + " srcVolUUID={9}" + "\r\n" + " ", - getParameters().getStorageDomainId().toString(), getParameters() - .getStoragePoolId().toString(), getParameters().getImageGroupId() - .toString(), getParameters().getImageSizeInBytes(), - getParameters().getVolumeFormat().name(), getParameters() - .getImageType().name(), - getParameters().getNewImageID().toString(), getParameters() - .getNewImageDescription(), getParameters().getSourceImageGroupId() - .toString(), getParameters().getImageId().toString()); + log.infoFormat( + "-- createVolume parameters: sdUUID={0} spUUID={1} imgGUID={2} size={3} bytes volFormat={4} volType={5} volUUID={6} descr={7} srcImgGUID={8} srcVolUUID={9}", + getParameters().getStorageDomainId().toString(), + getParameters().getStoragePoolId().toString(), + getParameters().getImageGroupId().toString(), + getParameters().getImageSizeInBytes(), + getParameters().getVolumeFormat().name(), + getParameters().getImageType().name(), + getParameters().getNewImageID().toString(), + getParameters().getNewImageDescription(), + getParameters().getSourceImageGroupId().toString(), + getParameters().getImageId().toString()); // NOTE: The 'uuidReturn' variable will contain the taskID and not // the created image id! -- To view, visit http://gerrit.ovirt.org/20983 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I73eae1a3d76ffca00089ace3e9fc371950da30ff Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eli Mesika <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
