From cf678b5a561c206bded3ac29d9048481d0f6b85e Mon Sep 17 00:00:00 2001 From: Andreas Romeyke <andreas.romeyke@slub-dresden.de> Date: Fri, 27 Jan 2023 09:05:06 +0100 Subject: [PATCH] - minor fix in logging output --- PLUGIN-INF/metadata_SLUBStoragePlugin.xml | 2 +- .../plugin/storage/nfs/SLUBStoragePlugin.java | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/PLUGIN-INF/metadata_SLUBStoragePlugin.xml b/PLUGIN-INF/metadata_SLUBStoragePlugin.xml index 47e8037..20f3e59 100644 --- a/PLUGIN-INF/metadata_SLUBStoragePlugin.xml +++ b/PLUGIN-INF/metadata_SLUBStoragePlugin.xml @@ -70,7 +70,7 @@ </fr:x_form> </pl:initParameters> <pl:description>SLUB Storage Plugin</pl:description> - <pl:version>2.841</pl:version> + <pl:version>2.842</pl:version> <pl:materialType>DIGITAL</pl:materialType> <pl:module>Repository</pl:module> <pl:generalType>TASK</pl:generalType> diff --git a/java/org/slub/rosetta/dps/repository/plugin/storage/nfs/SLUBStoragePlugin.java b/java/org/slub/rosetta/dps/repository/plugin/storage/nfs/SLUBStoragePlugin.java index 092ba39..f8c5a4a 100644 --- a/java/org/slub/rosetta/dps/repository/plugin/storage/nfs/SLUBStoragePlugin.java +++ b/java/org/slub/rosetta/dps/repository/plugin/storage/nfs/SLUBStoragePlugin.java @@ -467,10 +467,11 @@ public class SLUBStoragePlugin extends AbstractStorageHandler { } try (OutputStream output = java.nio.file.Files.newOutputStream( Paths.get( absolute_destFilePath))) { + var blocksize = getBlockSize(); long starttime = System.currentTimeMillis(); - IOUtil.copy(is, output, getBlockSize()); + IOUtil.copy(is, output, blocksize); long endtime = System.currentTimeMillis(); - log.info("SLUBStoragePlugin.storeEntity() try copy (IOUtil.copy(is, '"+absolute_destFilePath+"', blocksize) was successfull (" + throughput(starttime, endtime, absolute_destFilePath)+ ")" ); + log.info("SLUBStoragePlugin.storeEntity() try copy (IOUtil.copy(is, '"+absolute_destFilePath+"', "+blocksize+") was successfull (" + throughput(starttime, endtime, absolute_destFilePath)+ ")" ); } } if (!checkFixity(storedEntityMetadata.getFixities(), storedEntityIdentifier)) { @@ -631,9 +632,9 @@ public class SLUBStoragePlugin extends AbstractStorageHandler { contractAssertIsRelativePath(relativePath); paths.put("relativeDirectoryPath", relativePath); log.info( - "SLUBStoragePlugin.getStoreEntityIdentifier() stored: " - + "destFilePath='" + destFilePath + "'" - + "relativeDirectoryPath='" + relativePath + "'" + "SLUBStoragePlugin.getStoreEntityIdentifier() stored:" + + " destFilePath='" + destFilePath + "'" + + " relativeDirectoryPath='" + relativePath + "'" ); return paths; } -- GitLab