From b5cfd49c21b0bf021aeca3b12861f2ad45e096ef Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Fri, 10 Nov 2017 15:55:46 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30714 --- server/-configuration/scheduledjobs.json | 2 +- .../config/config.xml | 6 +- .../config/scheduledjobs.json | 94 +++++++++++++++++++ .../deploy-steps-to-bsh.bat | 4 +- .../CheckMORPHEUSMissingMaterialsStep.java | 11 ++- .../commons/octopus/OctopusDataMiner.java | 8 +- .../src/user/jobengine/server/JobRuntime.java | 2 +- 7 files changed, 113 insertions(+), 14 deletions(-) create mode 100644 server/user.jobengine.executors/config/scheduledjobs.json diff --git a/server/-configuration/scheduledjobs.json b/server/-configuration/scheduledjobs.json index d6ab42dc..3b28b6bc 100644 --- a/server/-configuration/scheduledjobs.json +++ b/server/-configuration/scheduledjobs.json @@ -70,7 +70,7 @@ "name" : "OCTOPUS adatok szinkronizálása", "template": "sync-octopus.xml", "executeimmediate": true, - "cronexpression": "0 0/2 * * * ?" + "cronexpression": "0 0/1 * * * ?" }, { "active": false, diff --git a/server/user.jobengine.executors/config/config.xml b/server/user.jobengine.executors/config/config.xml index 066dc7a4..b0c2901f 100644 --- a/server/user.jobengine.executors/config/config.xml +++ b/server/user.jobengine.executors/config/config.xml @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/server/user.jobengine.executors/config/scheduledjobs.json b/server/user.jobengine.executors/config/scheduledjobs.json new file mode 100644 index 00000000..3b28b6bc --- /dev/null +++ b/server/user.jobengine.executors/config/scheduledjobs.json @@ -0,0 +1,94 @@ +{"joblist":[ + { + "active": false, + "name" : "Felhasználói archiválás", + "template": "archive-ondemand.xml", + "executeimmediate": true, + "cronexpression": "0 0 0/1 1/1 * ? *", + "parameters": [ + {"name": "sourcePath", "value": "/mnt/ISILON/ARCHIVE", "type": "java.lang.String"}, + {"name": "globalSourcePath", "value": "\\\\10.10.1.100\\BRAAVOS\\ARCHIVE", "type": "java.lang.String"}, + {"name": "transcoderTargetPath", "value": "/mnt/SELENIO", "type": "java.lang.String"}, + {"name": "webPath", "value": "/mediacube/data/lowres/www/video", "type": "java.lang.String"}, + {"name": "killDateDays", "value": 1, "type": "java.lang.Integer"} + ] + }, + { + "active": false, + "name" : "TRAFFIC anyagok visszatöltése", + "template": "retrieve-traffic-missing-materials.xml", + "executeimmediate": true, + "cronexpression": "0 0 0/1 1/1 * ? *", + "parameters": [ + {"name": "dbUrl", "value": "jdbc:sqlserver://10.10.1.45\\sql16;databaseName=PA_Echo;", "type": "java.lang.String"}, + {"name": "userName", "value": "MAM", "type": "java.lang.String"}, + {"name": "password", "value": "Echotv.hu", "type": "java.lang.String"}, + {"name": "lookupDays", "value": 7, "type": "java.lang.Integer"}, + {"name": "targetPath", "value": "/mnt/ISILON/PLAYOUT/IceGateway/Input", "type": "java.lang.String"}, + {"name": "killDateDays", "value": 10, "type": "java.lang.Integer"} + ] + }, + { + "active": false, + "name" : "MORPHEUS anyagok visszatöltése", + "template": "retrieve-morpheus-missing-materials.xml", + "executeimmediate": true, + "cronexpression": "0 0 0/1 1/1 * ? *", + "parameters": [ + {"name": "sourcePath", "value": "/mnt/MORPHEUS", "type": "java.lang.String"}, + {"name": "targetPath", "value": "/mnt/ISILON/PLAYOUT/IceGateway/Input", "type": "java.lang.String"}, + {"name": "killDateDays", "value": 10, "type": "java.lang.Integer"} + ] + }, + { + "active": false, + "name" : "Anyagok törlése", + "template": "delete-materials.xml", + "executeimmediate": true, + "cronexpression": "0 0 0/1 1/1 * ? *", + "parameters": [ + {"name": "sourcePath", "value": "\\\\10.10.1.100\\BRAAVOS\\ARCHIVE", "type": "java.lang.String"}, + {"name": "userName", "value": "mediacube", "type": "java.lang.String"}, + {"name": "password", "value": "Broadca5T", "type": "java.lang.String"} + ] + }, + { + "active": false, + "name" : "NEXIO anyagok törlése", + "template": "delete-nexio-materials.xml", + "executeimmediate": true, + "cronexpression": "0 0 0/1 1/1 * ? *", + "parameters": [ + {"name": "port", "value": 2098, "type": "java.lang.Integer"}, + {"name": "userName", "value": "administrator", "type": "java.lang.String"}, + {"name": "password", "value": "system", "type": "java.lang.String"}, + {"name": "gracePeriodDays", "value": 1, "type": "java.lang.Integer"} + ] + }, + { + "active": true, + "name" : "OCTOPUS adatok szinkronizálása", + "template": "sync-octopus.xml", + "executeimmediate": true, + "cronexpression": "0 0/1 * * * ?" + }, + { + "active": false, + "name" : "Párhuzamosított teszt folyamat", + "template": "fake-concurrent.xml", + "executeimmediate": false, + "cronexpression": "0/10 * * ? * *", + "parameters": [ {"name": "itemID", "value": 1, "type": "java.lang.Long"} ] + }, + { + "active": false, + "name" : "Teszt folyamat", + "template": "fake.xml", + "executeimmediate": false, + "cronexpression": "0/10 * * ? * *", + "parameters": [ {"name": "itemID", "value": 1, "type": "java.lang.Long"} ] + } +]} + + + diff --git a/server/user.jobengine.executors/deploy-steps-to-bsh.bat b/server/user.jobengine.executors/deploy-steps-to-bsh.bat index 77ff5dd3..288eec44 100644 --- a/server/user.jobengine.executors/deploy-steps-to-bsh.bat +++ b/server/user.jobengine.executors/deploy-steps-to-bsh.bat @@ -11,7 +11,7 @@ SET LOCAL_CONFIG_LOCATION=config ECHO --- Deploying WinSCP.com /command ^ - "open %REMOTE_SERVER_ADDRESS% -hostkey=""%REMOTE_SERVER_HOSTKEY%""" ^ + "open %REMOTE_SERVER_ADDRESS% -hostkey=""%REMOTE_SERVER_HOSTKEY%"" -timeout=60" ^ "cd %REMOTE_LOCATION%" ^ "lcd %LOCAL_STEPS_LOCATION%" ^ "synchronize remote" ^ @@ -22,6 +22,8 @@ SET LOCAL_CONFIG_LOCATION=config "lcd ..\" ^ "lcd %LOCAL_CONFIG_LOCATION%" ^ "synchronize remote -filemask=config.xml" ^ + "cd .." ^ + "synchronize remote -filemask=scheduledjobs.json" ^ "call pcs resource restart mediacube_script" ^ "exit" diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckMORPHEUSMissingMaterialsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckMORPHEUSMissingMaterialsStep.java index 0e9d301d..37b8bd19 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckMORPHEUSMissingMaterialsStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckMORPHEUSMissingMaterialsStep.java @@ -59,13 +59,13 @@ public class CheckMORPHEUSMissingMaterialsStep extends JobStep { } private void processMediaId(String mediaId) throws Exception { - List medias = dao.getByHouseId(mediaId); + List medias = dao.getByHouseId(mediaId + ".MXF"); if (medias == null || medias.size() == 0) { logger.error(getMarker(), "Az {} anyag nem található az archívumban.", mediaId); return; } - if (medias.size() > 0) { + if (medias.size() > 1) { logger.error(getMarker(), "Az {} anyagból egynél több található az archívumban.", mediaId); return; } @@ -114,8 +114,9 @@ public class CheckMORPHEUSMissingMaterialsStep extends JobStep { logger.error(getMarker(), "A {} MORPHEUS állomány feldolgozásakor hiba történt. A rendszer hibaüzenete: {}.", csvFile.getName(), e.getMessage()); } - if (!csvFile.delete()) - logger.error(getMarker(), "A {} MORPHEUS állomány nem törölhető.", csvFile.getName()); + //TODO ne törölje, move + // if (!csvFile.delete()) + // logger.error(getMarker(), "A {} MORPHEUS állomány nem törölhető.", csvFile.getName()); } private void setAndCheck(String sourcePath, String targetPath, IJobEngine jobEngine) { @@ -123,6 +124,8 @@ public class CheckMORPHEUSMissingMaterialsStep extends JobStep { logger.error(getMarker(), "Az folyamatkezelő réteg nem elérhető."); throw new NullPointerException("Internal error, missing JobEngine reference."); } + this.jobEngine = jobEngine; + IItemManager manager = jobEngine.getItemManager(); if (manager == null) { logger.error(getMarker(), "Az adatbáziskezelő réteg nem elérhető."); diff --git a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java index 97614b64..183fb311 100644 --- a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java +++ b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java @@ -567,7 +567,7 @@ public class OctopusDataMiner implements Runnable { rundown.put(MODIFIED, toDate(rundown, MODIFIED)); DBCollection collection = db.getCollection(RUNDOWN_COLLECTION_NAME); if (lastUpdateTime == null || (lastUpdateTime != null && isModified(lastUpdateTime, rundown))) { - logger.info(SAVING_RUNDOWN, rundownID, name); + logger.debug(SAVING_RUNDOWN, rundownID, name); collection.save(rundown); } logger.trace(EXIT); @@ -578,7 +578,7 @@ public class OctopusDataMiner implements Runnable { List rundownsList = NoSQLUtils.asList(rundowns); int idx = 1; for (BasicDBObject rundown : rundownsList) { - logger.info(String.format(CHECKING_RUNDOWN_S_D_D, rundown.getLong(ID), rundownsList.size(), idx)); + logger.debug(String.format(CHECKING_RUNDOWN_S_D_D, rundown.getLong(ID), rundownsList.size(), idx)); storeRundown(rundown, lastUpdateTime); int progress = idx * 50 / rundownsList.size(); if (progress - progressEvent.getProgress() > 0) { @@ -647,7 +647,7 @@ public class OctopusDataMiner implements Runnable { story.remove(MOS_OBJECTS); } else story.put(MOS_OBJECTS, modifiedMOS); - logger.info(SAVING_STORY_ID, storyID); + logger.debug(SAVING_STORY_ID, storyID); collection.save(story); logger.trace(EXIT); } @@ -674,7 +674,7 @@ public class OctopusDataMiner implements Runnable { List storyFolderList = NoSQLUtils.asList(storyFolders); int idx = 1; for (BasicDBObject storyFolder : storyFolderList) { - logger.info(String.format(CHECKING_STORY_FOLDER_S_D_D, storyFolder.getLong(ID), storyFolderList.size(), idx)); + logger.debug(String.format(CHECKING_STORY_FOLDER_S_D_D, storyFolder.getLong(ID), storyFolderList.size(), idx)); storeStoryFolder(storyFolder, lastUpdateTime); int progress = 50 + (idx * 50 / storyFolderList.size()); if (progress - progressEvent.getProgress() > 0) { diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java index b3286f1b..aa1336d9 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java @@ -107,7 +107,7 @@ public class JobRuntime extends Job implements IJobRuntime { if (children == null) children = new ArrayList<>(); children.add(c); - Message m = logger.getMessageFactory().newMessage("{} alfolyamata", children.size(), this.getId()); + Message m = logger.getMessageFactory().newMessage("{} {} alfolyamata", this.getId(), this.getName()); c.setName(m.getFormattedMessage()); c.setParentJobId(this.getId()); } -- 2.54.0