From: vasary.daniel Date: Wed, 2 Jun 2021 19:15:53 +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=c97742f45be27da0eee0c5a78fd36718db8a4fd1;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32254 --- diff --git a/server/-product/production/HIRTV/jobs/schedules.json b/server/-product/production/HIRTV/jobs/schedules.json index 2f921d82..825fd64e 100644 --- a/server/-product/production/HIRTV/jobs/schedules.json +++ b/server/-product/production/HIRTV/jobs/schedules.json @@ -3,6 +3,19 @@ "active": true, "cronexpression": "0/2 * * * * ?", "template": "cancelable.xml" - } + }, + { + "active": true, + "executeimmediate": true, + "name" : "OCTOPUS adatok szinkronizálása", + "template": "sync-octopus.xml", + "cronexpression": "0/30 * * * * ?", + "parameters": [ + {"name": "includeArchived", "value": false, "type": "java.lang.Boolean"}, + {"name": "address", "value": "http://10.10.1.11/api/v1", "type": "java.lang.String"}, + {"name": "user", "value": "mam", "type": "java.lang.String"}, + {"name": "pwd", "value": "napocska", "type": "java.lang.String"} + ] + } ] } \ No newline at end of file diff --git a/server/-product/production/HIRTV/settings/application.yaml b/server/-product/production/HIRTV/settings/application.yaml index 3d13d1ce..7e7e4054 100644 --- a/server/-product/production/HIRTV/settings/application.yaml +++ b/server/-product/production/HIRTV/settings/application.yaml @@ -32,9 +32,9 @@ services: address: http://10.10.1.11/api/v1 user: mama password: napocska - rundowns-collection-name: rundowns-test - stories-collection-name: stories1-test - folders-collection-name: storyfolders-test + rundowns-collection-name: rundowns + stories-collection-name: stories + folders-collection-name: storyfolders jobs: validate-transfers: false copy-buffer-size: 32768 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 b974797f..7bb46787 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 @@ -42,13 +42,13 @@ import user.jobengine.server.steps.shared.MetadataTypeDetector; public class CopyForArchiveNEXIOMaterialsStep extends JobStep { private static final String SCHEDULED_FORMAT = "yyyy.MM.dd HH:mm"; - private static final Logger logger = LogManager.getLogger(); + private static final Logger logger = LogManager.getLogger("CopyForArchiveNEXIOMaterialsStep"); private static final String UTF_8 = "utf-8"; private static final String JSON_EXT = ".json"; private static final String XML_EXT = ".xml"; private static final String DURATION = "duration"; private static final String MXFEXT = ".MXF"; - private static final String NEXIOCLIPS = "nexioclips"; + private static final String NEXIOCLIPS = SystemConfiguration.getInstance().value("services.nexio.collection-name", "nexioclips"); private static final String LONGNAMEID = "longnameid"; private static final String ARCHIVEDRUNDOWNS = "archivedrundowns"; private static final String ID = "id"; @@ -178,7 +178,7 @@ public class CopyForArchiveNEXIOMaterialsStep extends JobStep { 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 = getMarker(); - logger.info(systemMarker, "test"); + logger.debug(systemMarker, "debug test"); setAndCheck(nexioPort, nexioUserName, nexioPassword, archiveFtp, archiveUserName, archivePassword, nexioKillDateDays, nexioAgency, jobEngine); octopusAPI = new OctopusAPI(); Calendar scheduledDate = Calendar.getInstance(); @@ -218,13 +218,13 @@ 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(systemMarker, "Skipping MOS object {}", mosID); + logger.info(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(systemMarker, "File {} NOT exists", mosID); + logger.info(systemMarker, "File {} NOT exists", mosID); return null; //throw new Exception(String.format("File NOT exists %s", mosID)); } else { @@ -233,11 +233,11 @@ public class CopyForArchiveNEXIOMaterialsStep extends JobStep { long duration = NoSQLUtils.asLong(clip, DURATION); if (duration == 0) { - logger.debug(systemMarker, "File {} exists with 0 frame length", mosID); + logger.info(systemMarker, "File {} exists with 0 frame length", mosID); return null; } if (duration == 1) { - logger.debug(systemMarker, "File {} exists with 1 frame length", mosID); + logger.info(systemMarker, "File {} exists with 1 frame length", mosID); return null; } return new FileArchive(mosID, duration); @@ -249,25 +249,32 @@ public class CopyForArchiveNEXIOMaterialsStep extends JobStep { if (!demo) logger.info(systemMarker, "Processing rundown {} {}", rundownID, rundown.getString(IOctopusAPI.NAME)); List stories = octopusAPI.getRundownFullStories(rundownID); - if (stories == null) + if (stories == null) { + logger.info(systemMarker, "Rundown {} {} is empty", rundownID, rundown.getString(IOctopusAPI.NAME)); return null; + } RundownArchive result = new RundownArchive(); long id = NoSQLUtils.asLong(rundown, IOctopusAPI.ID); if (id == 0) return null; String name = NoSQLUtils.asString(NoSQLUtils.asDBObject(rundown, IOctopusAPI.RUNDOWN_TYPE), IOctopusAPI.NAME); - if (StringUtils.isBlank(name)) + if (StringUtils.isBlank(name)) { + logger.info(systemMarker, "Rundown {} {} type is empty", rundownID, rundown.getString(IOctopusAPI.NAME)); return null; + } String channel = NoSQLUtils.asString(NoSQLUtils.asDBObject(rundown, IOctopusAPI.CHANNEL), IOctopusAPI.NAME); Date scheduledStart = rundown.getDate(IOctopusAPI.SCHEDULED_START); - if (scheduledStart == null) + if (scheduledStart == null) { + logger.info(systemMarker, "Rundown {} {} schedule is empty", rundownID, rundown.getString(IOctopusAPI.NAME)); return null; + } String start = CalendarUtils.toString(CalendarUtils.createCalendar(scheduledStart), SCHEDULED_FORMAT); result.setScheduleDate(scheduledStart); result.setItemHouseId(String.valueOf(id)); result.setItemTitle(String.format("%s %s %s", start, name, channel)); + logger.info(systemMarker, "Processing stories in rundown {} {}", rundownID, rundown.getString(IOctopusAPI.NAME)); for (DBObject s : stories) { StoryArchive storyArchive = processStory(rundown, s); if (storyArchive == null) @@ -280,7 +287,7 @@ public class CopyForArchiveNEXIOMaterialsStep extends JobStep { private void processRundowns(List rundowns) { //TODO kiveni publikálás előtt - //db.getCollection(ARCHIVEDRUNDOWNS).drop(); + //db.getCollection(v).drop(); List archivedRundowns = queryArchivedRundowns(); logger.info(systemMarker, "Found {} rundowns to archive", archivedRundowns.size()); @@ -329,15 +336,18 @@ public class CopyForArchiveNEXIOMaterialsStep extends JobStep { private StoryArchive processStory(BasicDBObject rundown, DBObject s) throws Exception { BasicDBObject story = (BasicDBObject) s; String parentStoryID = story.getString(IOctopusAPI.PARENT_STORY_ID); + String storyID = story.getString(IOctopusAPI.ID); + if (StringUtils.isBlank(parentStoryID)) { logger.warn(systemMarker, "Story parentStoryID is null: {}", story.toPrettyString(null)); return null; - } else - logger.info(systemMarker, "Processing story {}", parentStoryID); + } else { + if ("475048225".equals(storyID)) + logger.info(systemMarker, "Processing story {}", story.toPrettyString(null)); + } List mosObjects = NoSQLUtils.asList(story, IOctopusAPI.MOS_OBJECTS); if (mosObjects == null) { - logger.info(systemMarker, "No MOS in story {}: {}", parentStoryID, story.toPrettyString(null)); - + logger.debug(systemMarker, "No MOS in story {}", storyID); return null; } StoryArchive storyArchive = null; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java index cd4ebc75..a37e8cd8 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java @@ -1,5 +1,7 @@ package user.jobengine.server.steps.shared; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Calendar; import java.util.Date; import java.util.HashMap; @@ -291,6 +293,7 @@ public class OctopusDataMiner { return null; Map mosLabels = extractScriptMosObjectIDs(story); + //logger.info(Arrays.deepToString(new ArrayList<>(mosLabels.keySet()))); BasicDBList result = null; for (BasicDBObject mosObject : mosObjects) { if (!mosObject.containsKey(IOctopusAPI.MOS_ID)) @@ -302,6 +305,9 @@ public class OctopusDataMiner { if (objId == null) continue; + + logger.info("MOS ID: {}", objId); + MetadataType metadataType = MetadataTypeDetector.GuessMetadataType(objId); if (!MetadataType.OctopusPlaceholder.equals(metadataType) && !MetadataType.OctopusStory.equals(metadataType)) continue;