From: vasary.daniel Date: Wed, 2 Jun 2021 09:02:17 +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=67ea5d98061ab04804fa05d87fd6dfbce1457560;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32252 --- diff --git a/server/-configuration/run-mediacube-server-hirtv.launch b/server/-configuration/run-mediacube-server-hirtv.launch index 4f2f3d81..2716732a 100644 --- a/server/-configuration/run-mediacube-server-hirtv.launch +++ b/server/-configuration/run-mediacube-server-hirtv.launch @@ -21,7 +21,7 @@ - + @@ -36,7 +36,6 @@ - diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIOMaterialsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIOMaterialsStep.java index 4c6b7a7f..b974797f 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIOMaterialsStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIOMaterialsStep.java @@ -177,7 +177,8 @@ public class CopyForArchiveNEXIOMaterialsStep extends JobStep { @StepEntry public Object[] execute(int nexioPort, String nexioUserName, String nexioPassword, String archiveFtp, String archiveUserName, String archivePassword, int daysBeforeNow, int nexioKillDateDays, String nexioAgency, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception { - systemMarker = jobRuntime.getSessionMarker(); + systemMarker = getMarker(); + logger.info(systemMarker, "test"); setAndCheck(nexioPort, nexioUserName, nexioPassword, archiveFtp, archiveUserName, archivePassword, nexioKillDateDays, nexioAgency, jobEngine); octopusAPI = new OctopusAPI(); Calendar scheduledDate = Calendar.getInstance(); @@ -217,26 +218,26 @@ public class CopyForArchiveNEXIOMaterialsStep extends JobStep { private FileArchive processMosObject(BasicDBObject rundown, BasicDBObject story, BasicDBObject mosObject) throws Exception { String mosID = mosObject.getString(IOctopusAPI.OBJ_ID); if (MetadataTypeDetector.GuessMetadataType(mosID) != MetadataType.OctopusPlaceholder) { - logger.trace("Skipping MOS object {}", mosID); + logger.trace(systemMarker, "Skipping MOS object {}", mosID); return null; } DBCollection clips = db.getCollection(NEXIOCLIPS); BasicDBObject clip = (BasicDBObject) clips.findOne(new BasicDBObject(LONGNAMEID, mosID)); if (clip == null) { - logger.debug("File {} NOT exists", mosID); + logger.debug(systemMarker, "File {} NOT exists", mosID); return null; //throw new Exception(String.format("File NOT exists %s", mosID)); } else { - logger.debug("File {} exists", mosID); + logger.debug(systemMarker, "File {} exists", mosID); } long duration = NoSQLUtils.asLong(clip, DURATION); if (duration == 0) { - logger.debug("File {} exists with 0 frame length", mosID); + logger.debug(systemMarker, "File {} exists with 0 frame length", mosID); return null; } if (duration == 1) { - logger.debug("File {} exists with 1 frame length", mosID); + logger.debug(systemMarker, "File {} exists with 1 frame length", mosID); return null; } return new FileArchive(mosID, duration); @@ -246,7 +247,7 @@ public class CopyForArchiveNEXIOMaterialsStep extends JobStep { BasicDBObject rundown = (BasicDBObject) r; long rundownID = rundown.getLong(ID); if (!demo) - logger.info("Processing rundown {} {}", rundownID, rundown.getString(IOctopusAPI.NAME)); + logger.info(systemMarker, "Processing rundown {} {}", rundownID, rundown.getString(IOctopusAPI.NAME)); List stories = octopusAPI.getRundownFullStories(rundownID); if (stories == null) return null; @@ -282,30 +283,31 @@ public class CopyForArchiveNEXIOMaterialsStep extends JobStep { //db.getCollection(ARCHIVEDRUNDOWNS).drop(); List archivedRundowns = queryArchivedRundowns(); - logger.info(getMarker(), "Found {} rundowns to archive", archivedRundowns.size()); + logger.info(systemMarker, "Found {} rundowns to archive", archivedRundowns.size()); int index = 1; for (DBObject r : rundowns) { BasicDBObject rundown = (BasicDBObject) r; - setProgress(index * 100 / rundowns.size()); + int progress = index * 100 / rundowns.size(); + setProgress(progress); long rundownID = NoSQLUtils.asLong(rundown, IOctopusAPI.ID); String rundownName = NoSQLUtils.asString(rundown, IOctopusAPI.NAME); try { BasicDBObject currentRundownID = new BasicDBObject(IOctopusAPI.ID, rundownID); if (!demo && archivedRundowns != null && archivedRundowns.contains(currentRundownID)) { - logger.info("Skipping archived rundown {} {}", rundownID, rundownName); + logger.info(systemMarker, "Skipping archived rundown {} {}", rundownID, rundownName); continue; } RundownArchive rundownArchive = processRundow(r); if (rundownArchive == null || rundownArchive.isEmpty()) { if (!demo) - logger.info("Skipping rundown {} {}", rundownID, rundownName); + logger.info(systemMarker, "Skipping rundown {} {}", rundownID, rundownName); continue; } if (!demo) - logger.info("Saving rundown {} {}", rundownID, rundownName); + logger.info(systemMarker, "Saving rundown {} {}", rundownID, rundownName); copy(rundownArchive); if (!demo) logger.info(systemMarker, "A '{}' tükör {}db bejátszójának archiválása sikeres volt", rundownArchive.getItemTitle(), @@ -328,13 +330,16 @@ public class CopyForArchiveNEXIOMaterialsStep extends JobStep { BasicDBObject story = (BasicDBObject) s; String parentStoryID = story.getString(IOctopusAPI.PARENT_STORY_ID); if (StringUtils.isBlank(parentStoryID)) { - logger.warn("Story parentStoryID is null: {}", story.toPrettyString(null)); + logger.warn(systemMarker, "Story parentStoryID is null: {}", story.toPrettyString(null)); return null; } else - logger.debug("Processing story {}", parentStoryID); + logger.info(systemMarker, "Processing story {}", parentStoryID); List mosObjects = NoSQLUtils.asList(story, IOctopusAPI.MOS_OBJECTS); - if (mosObjects == null) + if (mosObjects == null) { + logger.info(systemMarker, "No MOS in story {}: {}", parentStoryID, story.toPrettyString(null)); + return null; + } StoryArchive storyArchive = null; for (BasicDBObject mosObject : mosObjects) { FileArchive fileArchive = processMosObject(rundown, story, mosObject);