From 427609f1204c80bed437a0aaf5853343a78a392d Mon Sep 17 00:00:00 2001 From: Sweidan Omar Date: Tue, 7 Dec 2021 12:46:25 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32512 --- .../LOCAL/jobs/steps/CalculateMD5Step.java | 8 ++++---- .../jobengine/server/steps/CalculateMD5Step.java | 15 +++++++-------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/server/-product/production/LOCAL/jobs/steps/CalculateMD5Step.java b/server/-product/production/LOCAL/jobs/steps/CalculateMD5Step.java index 4f2313b6..6c2e5467 100644 --- a/server/-product/production/LOCAL/jobs/steps/CalculateMD5Step.java +++ b/server/-product/production/LOCAL/jobs/steps/CalculateMD5Step.java @@ -16,7 +16,7 @@ import org.apache.logging.log4j.message.ParameterizedMessage; import user.commons.MediaCubeMarker; public class CalculateMD5Step extends JobStep { - private static final Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(CalculateMD5Step.class); @StepEntry public Object[] execute(String fileName) throws Exception { @@ -43,7 +43,7 @@ public class CalculateMD5Step extends JobStep { while ((byteCount = dis.read(byteArray)) != -1) { messageDigest.update(byteArray, 0, byteCount); digest = messageDigest.digest(); - setProgress(50); + setProgress(1); } } catch (NoSuchAlgorithmException e) { e.printStackTrace(); @@ -51,8 +51,8 @@ public class CalculateMD5Step extends JobStep { dis.close(); } - logger.info("digest= ", digest.toString()); - logger.info("fileSize= ", fileSize); + logger.info("digest= {}", digest.toString()); + logger.info("fileSize= {}", fileSize); return new Object[] { digest.toString() }; } } \ No newline at end of file diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CalculateMD5Step.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CalculateMD5Step.java index 4f987dfa..bbf21dbc 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CalculateMD5Step.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CalculateMD5Step.java @@ -10,19 +10,15 @@ import java.security.NoSuchAlgorithmException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.message.Message; -import org.apache.logging.log4j.message.ParameterizedMessage; - -import user.commons.MediaCubeMarker; public class CalculateMD5Step extends JobStep { - private static final Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger(CalculateMD5Step.class); @StepEntry public Object[] execute(String fileName) throws Exception { logger.info(getMarker(), "Executing"); - Message msg = new ParameterizedMessage(""); - logger.info(new MediaCubeMarker("vasary@elgekko.net,vasary@gmail.com", "MediaCube rendszerüzenet"), msg); +// Message msg = new ParameterizedMessage(""); +// logger.info(new MediaCubeMarker("vasary@elgekko.net,vasary@gmail.com", "MediaCube rendszerüzenet"), msg); // getting file size Path fileToDigest = Paths.get(fileName); @@ -45,11 +41,14 @@ public class CalculateMD5Step extends JobStep { digest = messageDigest.digest(); setProgress(1); } - dis.close(); } catch (NoSuchAlgorithmException e) { e.printStackTrace(); + } finally { + dis.close(); } + logger.info("digest= {}", digest.toString()); + logger.info("fileSize= {}", fileSize); return new Object[] { digest.toString() }; } } \ No newline at end of file -- 2.54.0