From: vasary.daniel Date: Tue, 9 Mar 2021 15:04:56 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=dca1ffcecb9b4312810cf73687f166f309925b6d;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32165 --- diff --git a/server/-configuration/debug-mediacube-mv-8888.launch b/server/-configuration/debug-mediacube-mv-8888.launch index 8b33e223..1ce56516 100644 --- a/server/-configuration/debug-mediacube-mv-8888.launch +++ b/server/-configuration/debug-mediacube-mv-8888.launch @@ -1,18 +1,18 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/server/-product/production/AMC/jobs/steps/ForkDownloadStep.java b/server/-product/production/AMC/jobs/steps/ForkDownloadStep.java index 8b72db9d..f9715161 100644 --- a/server/-product/production/AMC/jobs/steps/ForkDownloadStep.java +++ b/server/-product/production/AMC/jobs/steps/ForkDownloadStep.java @@ -29,7 +29,7 @@ public class ForkDownloadStep extends JobStep { @StepEntry public Object[] execute(String tempStoreName, String template, String expectedColorSpace, int limit) throws Exception { - sendStatusReport(); +// sendStatusReport(); //return null; DirectoryStream directoryStream = null; int count = limit; diff --git a/server/-product/production/AMC/jobs/steps/PeableBeachMissingMaterialCheckerStep.java b/server/-product/production/AMC/jobs/steps/PeableBeachMissingMaterialCheckerStep.java index 74a80b51..3b1a1fa0 100644 --- a/server/-product/production/AMC/jobs/steps/PeableBeachMissingMaterialCheckerStep.java +++ b/server/-product/production/AMC/jobs/steps/PeableBeachMissingMaterialCheckerStep.java @@ -183,7 +183,7 @@ public class PeableBeachMissingMaterialCheckerStep extends JobStep { String fileName = normalizeName(mmedia.getName()); if (media == null) { - logger.error(getMarker(), "File {} not archived yet", mmedia.getName()); + logger.warn(getMarker(), "File {} not archived yet", mmedia.getName()); return; } diff --git a/server/-product/production/AMC/jobs/steps/ServerStatusReportStep.java b/server/-product/production/AMC/jobs/steps/ServerStatusReportStep.java index 3ffc5e3c..787a07e8 100644 --- a/server/-product/production/AMC/jobs/steps/ServerStatusReportStep.java +++ b/server/-product/production/AMC/jobs/steps/ServerStatusReportStep.java @@ -1,5 +1,6 @@ package user.jobengine.server.steps; +import java.time.Instant; import java.util.Map; import java.util.Set; @@ -15,7 +16,7 @@ public class ServerStatusReportStep extends JobStep { private static final Logger logger = LogManager.getLogger(); @StepEntry - public Object[] execute(String tempStoreName, String template, String expectedColorSpace, int limit) throws Exception { + public Object[] execute() throws Exception { IJobEngine engine = getEngine(); int jobCount = 0; StringBuilder sb = new StringBuilder(); @@ -30,7 +31,8 @@ public class ServerStatusReportStep extends JobStep { } } MediaCubeMarker marker = new MediaCubeMarker(); - marker.setSubject(String.format("[%d db] AMC MediaCube feldolgozás", jobCount)); + + marker.setSubject(String.format("%s [%d db] AMC MediaCube feldolgozás", Instant.now(), jobCount)); logger.info(marker, sb.toString()); return null; } diff --git a/server/-product/production/AMC/jobs/templates/server-status-report.xml b/server/-product/production/AMC/jobs/templates/server-status-report.xml new file mode 100644 index 00000000..eec3da65 --- /dev/null +++ b/server/-product/production/AMC/jobs/templates/server-status-report.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/server/user.jobengine.executors/amc/user/jobengine/server/steps/PASAPOOLTransferToStep.java b/server/user.jobengine.executors/amc/user/jobengine/server/steps/PASAPOOLTransferToStep.java index b5106b6e..0c69ee3a 100644 --- a/server/user.jobengine.executors/amc/user/jobengine/server/steps/PASAPOOLTransferToStep.java +++ b/server/user.jobengine.executors/amc/user/jobengine/server/steps/PASAPOOLTransferToStep.java @@ -22,13 +22,13 @@ public class PASAPOOLTransferToStep extends TransferStep { private static final String DISPLAY_ASPECT_4_3 = "4:3"; private StoreUri sourceStoreUri; private String sourceFileName; + private Marker marker = MarkerManager.getMarker("MEDIAPROFILE"); @Override @StepEntry public Object[] execute(StoreUri sourceStoreUri, String sourceFileName, StoreUri targetStoreUri, String targetFileName) throws Exception { this.sourceStoreUri = sourceStoreUri; this.sourceFileName = sourceFileName; - logMediaProfile(); long start = System.currentTimeMillis(); Object[] result = super.execute(sourceStoreUri, sourceFileName, targetStoreUri, targetFileName); RemoteFile remoteFile = sourceStoreUri.getRemoteFile(targetFileName); @@ -43,105 +43,60 @@ public class PASAPOOLTransferToStep extends TransferStep { return result; } - // HD - // height = 1080 - // >PEABLEBEACH | \\10.170.100.21\media\BeachPool - private boolean isHD(MediaArea mi) { - return mi.getHeight() == 1080; - } - - // @Override - // protected StoreUri getTargetStoreUri() { - // StoreUri result = null; - // try { - // Path filePath = Paths.get(sourceStoreUri.toString(true), sourceFileName); - // MediaInfo mi = new MediaInfo(filePath); - // mi.process(); - // - // if (isHD(mi)) { - // result = getManager().getStoreUri("PEABLEBEACH", targetStoreUri.getProtocol()); - // return result; - // } - // - // if (isSD_HIGH_16_9(mi)) { - // result = getManager().getStoreUri("SELENIOPOOL_16_9", targetStoreUri.getProtocol()); - // return result; - // } - // - // if (isSD_HIGH_4_3(mi)) { - // result = getManager().getStoreUri("SELENIOPOOL_4_3", targetStoreUri.getProtocol()); - // return result; - // } - // - // if (isSD_MAIN_422(mi)) { - // result = getManager().getStoreUri("PEABLEBEACH", targetStoreUri.getProtocol()); - // return result; - // } - // } catch (Exception e) { - // logger.error(getSessionMarker(), e.getMessage()); - // result = targetStoreUri; - // } - // return result; - // } - - // SD - HIGH@HIGH / 16:9 - // height < 650 - // profile=High - // aspect=16:9 - // >SELENIOPOOL_16_9 | \\10.170.100.21\media\SelenioPool\16_9 - private boolean isSD_HIGH_16_9(MediaArea mi) { - String formatProfileName = mi.getFormatProfileName(); - return mi.getHeight() < 650 && formatProfileName.contains(CODEC_PROFILE_HIGH) && DISPLAY_ASPECT_16_9.equals(mi.getDisplayAspect()); - } - - // SD - HIGH@HIGH / 4:3 - // height < 650 - // profile=High - // aspect=4:3 - // >SELENIOPOOL_4_3 | \\10.170.100.21\media\SelenioPool\4_3 - private boolean isSD_HIGH_4_3(MediaArea mi) { - String formatProfileName = mi.getFormatProfileName(); - return mi.getHeight() < 650 && formatProfileName.contains(CODEC_PROFILE_HIGH) && DISPLAY_ASPECT_4_3.equals(mi.getDisplayAspect()); - } - - // SD - MAIN/422@HIGH - // height < 650 - // profile=Main || profile=4:2:2 - // >PEABLEBEACH | \\10.170.100.21\media\BeachPool - private boolean isSD_MAIN_422(MediaArea mi) { - String formatProfileName = mi.getFormatProfileName(); - return mi.getHeight() < 650 && (formatProfileName.contains(CODEC_PROFILE_MAIN) || formatProfileName.contains(CODEC_PROFILE_422)); - } - - protected void logMediaProfile() { - Marker marker = MarkerManager.getMarker("MEDIAPROFILE"); + @Override + protected StoreUri getTargetStoreUri(StoreUri targetStoreUri) { + StoreUri result = targetStoreUri; try { Path filePath = Paths.get(sourceStoreUri.toString(true), sourceFileName); MediaArea mi = new MediaArea(filePath); mi.process(); if (isHD(mi)) { - logger.info(marker, "{} is HD", sourceFileName); - return; + logger.info(marker, "{} is MOVED_HD", sourceFileName); + result = getManager().getStoreUri("PEABLEBEACH", targetStoreUri.getProtocol()); + return result; } if (isSD_HIGH_16_9(mi)) { - logger.info(marker, "{} is SD_HIGH_16_9", sourceFileName); - return; + logger.info(marker, "{} is CONVSD16_9", sourceFileName); + result = getManager().getStoreUri("SELENIOPOOL_16_9", targetStoreUri.getProtocol()); + return result; } if (isSD_HIGH_4_3(mi)) { - logger.info(marker, "{} is SD_HIGH_4_3", sourceFileName); - return; + logger.info(marker, "{} is CONVSD4_3", sourceFileName); + result = getManager().getStoreUri("SELENIOPOOL_4_3", targetStoreUri.getProtocol()); + return result; } if (isSD_MAIN_422(mi)) { - logger.info(marker, "{} is SD_MAIN_422", sourceFileName); - return; + logger.info(marker, "{} is MOVED_SD", sourceFileName); + result = getManager().getStoreUri("PEABLEBEACH", targetStoreUri.getProtocol()); + return result; } } catch (Exception e) { - logger.error(marker, e.getMessage()); + logger.error(getSessionMarker(), e.getMessage()); } + return result; + } + + private boolean isHD(MediaArea mi) { + return mi.getHeight() == 1080; + } + + private boolean isSD_HIGH_16_9(MediaArea mi) { + String formatProfileName = mi.getFormatProfileName(); + return mi.getHeight() < 650 && formatProfileName.contains(CODEC_PROFILE_HIGH) && DISPLAY_ASPECT_16_9.equals(mi.getDisplayAspect()); + } + + private boolean isSD_HIGH_4_3(MediaArea mi) { + String formatProfileName = mi.getFormatProfileName(); + return mi.getHeight() < 650 && formatProfileName.contains(CODEC_PROFILE_HIGH) && DISPLAY_ASPECT_4_3.equals(mi.getDisplayAspect()); + } + + private boolean isSD_MAIN_422(MediaArea mi) { + String formatProfileName = mi.getFormatProfileName(); + return mi.getHeight() < 650 && (formatProfileName.contains(CODEC_PROFILE_MAIN) || formatProfileName.contains(CODEC_PROFILE_422)); } } diff --git a/server/user.jobengine.executors/amc/user/jobengine/server/steps/PeableBeachMissingMaterialCheckerStep.java b/server/user.jobengine.executors/amc/user/jobengine/server/steps/PeableBeachMissingMaterialCheckerStep.java index dc0d039a..10d01dbe 100644 --- a/server/user.jobengine.executors/amc/user/jobengine/server/steps/PeableBeachMissingMaterialCheckerStep.java +++ b/server/user.jobengine.executors/amc/user/jobengine/server/steps/PeableBeachMissingMaterialCheckerStep.java @@ -63,7 +63,7 @@ public class PeableBeachMissingMaterialCheckerStep extends JobStep { } /* if (1 == 1) { - + logger.info(getMarker(), "Kikapcsolva"); return null; } @@ -183,7 +183,7 @@ public class PeableBeachMissingMaterialCheckerStep extends JobStep { String fileName = normalizeName(mmedia.getName()); if (media == null) { - logger.error(getMarker(), "File {} not archived yet", mmedia.getName()); + logger.warn(getMarker(), "File {} not archived yet", mmedia.getName()); return; } diff --git a/server/user.jobengine.executors/amc/user/jobengine/server/steps/ServerStatusReportStep.java b/server/user.jobengine.executors/amc/user/jobengine/server/steps/ServerStatusReportStep.java new file mode 100644 index 00000000..787a07e8 --- /dev/null +++ b/server/user.jobengine.executors/amc/user/jobengine/server/steps/ServerStatusReportStep.java @@ -0,0 +1,39 @@ +package user.jobengine.server.steps; + +import java.time.Instant; +import java.util.Map; +import java.util.Set; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import user.commons.JobStatus; +import user.commons.MediaCubeMarker; +import user.jobengine.server.IJobEngine; +import user.jobengine.server.IJobRuntime; + +public class ServerStatusReportStep extends JobStep { + private static final Logger logger = LogManager.getLogger(); + + @StepEntry + public Object[] execute() throws Exception { + IJobEngine engine = getEngine(); + int jobCount = 0; + StringBuilder sb = new StringBuilder(); + Map jobs = engine.getJobs(); + if (jobs != null) { + Set keys = jobs.keySet(); + jobCount = keys.size(); + for (Long key : keys) { + IJobRuntime runtime = jobs.get(key); + if (JobStatus.SUSPENDED.equals(runtime.getStatus())) + sb.append(runtime.getRelated() + " felfüggesztve: " + runtime.getDescription() + "
"); + } + } + MediaCubeMarker marker = new MediaCubeMarker(); + + marker.setSubject(String.format("%s [%d db] AMC MediaCube feldolgozás", Instant.now(), jobCount)); + logger.info(marker, sb.toString()); + return null; + } +} diff --git a/server/user.jobengine.executors/amc/user/jobengine/server/steps/TransferStep.java b/server/user.jobengine.executors/amc/user/jobengine/server/steps/TransferStep.java index ae46a938..67cc025c 100644 --- a/server/user.jobengine.executors/amc/user/jobengine/server/steps/TransferStep.java +++ b/server/user.jobengine.executors/amc/user/jobengine/server/steps/TransferStep.java @@ -15,12 +15,10 @@ import user.jobengine.db.Store; public class TransferStep extends JobStep { private static final String DOT_PART = ".part"; private static final Logger logger = LogManager.getLogger(); - protected StoreUri targetStoreUri; @StepEntry public Object[] execute(StoreUri sourceStoreUri, String sourceFileName, StoreUri targetStoreUri, String targetFileName) throws Exception { try { - this.targetStoreUri = targetStoreUri; getJobRuntime().setCancelable(false); Store sourceStore = getManager().getStore(sourceStoreUri.getStoreId()); @@ -31,22 +29,11 @@ public class TransferStep extends JobStep { sourceStoreUri.addProgressListener(e -> setProgress(e.getProgress())); - this.targetStoreUri = getTargetStoreUri(); - tryCopy(sourceStoreUri, sourceFileName, targetStoreUri, targetFileName); + StoreUri currentTargetStoreUri = getTargetStoreUri(targetStoreUri); + tryCopy(sourceStoreUri, sourceFileName, currentTargetStoreUri, targetFileName); } catch (Exception e) { logger.error(getMarker(), "Error in transfer of {} when copying from {} to {}.", sourceFileName, sourceStoreUri, targetStoreUri); throw e; - // logger.error(getMarker(), "Error in transfer of {} when copying from {} to {}. Retrying after 3 seconds.", sourceFileName, sourceStoreUri, - // targetStoreUri); - - // try { - // Thread.sleep(3000); - // tryCopy(sourceStoreUri, sourceFileName, targetStoreUri, targetFileName); - // } catch (Exception e1) { - // logger.error(getSessionMarker(), "Error in transfer of {} when copying from {} to {}. System message is: {}", sourceFileName, sourceStoreUri, - // targetStoreUri, e1.getMessage()); - // throw e1; - // } } finally { if (sourceStoreUri != null) sourceStoreUri.cleanUp(); @@ -56,7 +43,7 @@ public class TransferStep extends JobStep { return null; } - protected StoreUri getTargetStoreUri() { + protected StoreUri getTargetStoreUri(StoreUri targetStoreUri) { return targetStoreUri; } diff --git a/server/user.jobengine.executors/amc/user/jobengine/server/steps/VODTransferToStep.java b/server/user.jobengine.executors/amc/user/jobengine/server/steps/VODTransferToStep.java index c80c99ca..d17eaa1e 100644 --- a/server/user.jobengine.executors/amc/user/jobengine/server/steps/VODTransferToStep.java +++ b/server/user.jobengine.executors/amc/user/jobengine/server/steps/VODTransferToStep.java @@ -4,22 +4,19 @@ import user.commons.StoreUri; public class VODTransferToStep extends TransferStep { private String relativeTargetPath; - private StoreUri targetStoreUri; - - @Override - protected StoreUri getTargetStoreUri() { - StoreUri result = getManager().getStoreUri(targetStoreUri.getId()); - result.setRootPath(relativeTargetPath); - return result; - } @StepEntry public Object[] execute(StoreUri sourceStoreUri, String sourceFileName, StoreUri targetStoreUri, String relativeTargetPath, String targetFileName) throws Exception { - this.targetStoreUri = targetStoreUri; this.relativeTargetPath = relativeTargetPath; - return super.execute(sourceStoreUri, sourceFileName, targetStoreUri, targetFileName); } + @Override + protected StoreUri getTargetStoreUri(StoreUri targetStoreUri) { + StoreUri result = getManager().getStoreUri(targetStoreUri.getId()); + result.setRootPath(relativeTargetPath); + return result; + } + }