git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/-configuration/scheduledjobs.json b/server/-configuration/scheduledjobs.json
index d6ab42dcfd99befb019b7827a41e81c537090cac..3b28b6bc25355a3946d0a49691a0eb7613b479f5 100644 (file)
--- a/server/-configuration/scheduledjobs.json
+++ b/server/-configuration/scheduledjobs.json
@@ -70,7 +70,7 @@
          "name" : "OCTOPUS adatok szinkronizálása",\r
       "template": "sync-octopus.xml",\r
       "executeimmediate": true,\r
-      "cronexpression": "0 0/2 * * * ?"\r
+      "cronexpression": "0 0/1 * * * ?"\r
        },      \r
        {\r
       "active": false,\r

diff --git a/server/user.jobengine.executors/config/config.xml b/server/user.jobengine.executors/config/config.xml
index 066dc7a48927db0172dec6fabe2a33df5aa22dc7..b0c2901fa439eb5666688c120dbdc6223e922b62 100644 (file)
--- a/server/user.jobengine.executors/config/config.xml
+++ b/server/user.jobengine.executors/config/config.xml
@@ -9,7 +9,7 @@
        <executor className="user.jobengine.server.steps.FakeStep" maxConcurrent="1"/>\r
        <executor className="user.jobengine.server.steps.MetadataTransformStep" maxConcurrent="1"/>\r
        <executor className="user.jobengine.server.steps.SyncOCTOPUSDataStep" maxConcurrent="1"/>\r
-       <executor className="user.jobengine.server.steps.TranscodeSELENIOStep" maxConcurrent="1"/>\r
-       <executor className="user.jobengine.server.steps.TSMBackupStep" maxConcurrent="1"/>\r
-       <executor className="user.jobengine.server.steps.TSMRestoreStep" maxConcurrent="1"/>\r
+       <executor className="user.jobengine.server.steps.TranscodeSELENIOStep" maxConcurrent="4"/>\r
+       <executor className="user.jobengine.server.steps.TSMBackupStep" maxConcurrent="4"/>\r
+       <executor className="user.jobengine.server.steps.TSMRestoreStep" maxConcurrent="4"/>\r
 </executors>
\ 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 (file)
index 0000000..3b28b6b
--- /dev/null
+++ b/server/user.jobengine.executors/config/scheduledjobs.json
@@ -0,0 +1,94 @@
+{"joblist":[\r
+       {\r
+      "active": false,\r
+         "name" : "Felhasználói archiválás",\r
+      "template": "archive-ondemand.xml",\r
+      "executeimmediate": true,\r
+      "cronexpression": "0 0 0/1 1/1 * ? *",\r
+      "parameters": [ \r
+       {"name": "sourcePath", "value": "/mnt/ISILON/ARCHIVE", "type": "java.lang.String"},\r
+       {"name": "globalSourcePath", "value": "\\\\10.10.1.100\\BRAAVOS\\ARCHIVE", "type": "java.lang.String"},\r
+       {"name": "transcoderTargetPath", "value": "/mnt/SELENIO", "type": "java.lang.String"},\r
+       {"name": "webPath", "value": "/mediacube/data/lowres/www/video", "type": "java.lang.String"},\r
+       {"name": "killDateDays", "value": 1, "type": "java.lang.Integer"}\r
+      ]\r
+       },\r
+       {\r
+      "active": false,\r
+         "name" : "TRAFFIC anyagok visszatöltése",\r
+      "template": "retrieve-traffic-missing-materials.xml",\r
+      "executeimmediate": true,\r
+      "cronexpression": "0 0 0/1 1/1 * ? *",\r
+      "parameters": [\r
+       {"name": "dbUrl", "value": "jdbc:sqlserver://10.10.1.45\\sql16;databaseName=PA_Echo;", "type": "java.lang.String"},\r
+       {"name": "userName", "value": "MAM", "type": "java.lang.String"},\r
+       {"name": "password", "value": "Echotv.hu", "type": "java.lang.String"},\r
+       {"name": "lookupDays", "value": 7, "type": "java.lang.Integer"},\r
+       {"name": "targetPath", "value": "/mnt/ISILON/PLAYOUT/IceGateway/Input", "type": "java.lang.String"},\r
+       {"name": "killDateDays", "value": 10, "type": "java.lang.Integer"}\r
+      ]\r
+       },      \r
+       {\r
+      "active": false,\r
+         "name" : "MORPHEUS anyagok visszatöltése",\r
+      "template": "retrieve-morpheus-missing-materials.xml",\r
+      "executeimmediate": true,\r
+      "cronexpression": "0 0 0/1 1/1 * ? *",\r
+      "parameters": [\r
+       {"name": "sourcePath", "value": "/mnt/MORPHEUS", "type": "java.lang.String"},\r
+       {"name": "targetPath", "value": "/mnt/ISILON/PLAYOUT/IceGateway/Input", "type": "java.lang.String"},\r
+       {"name": "killDateDays", "value": 10, "type": "java.lang.Integer"}\r
+      ]\r
+       },      \r
+       {\r
+      "active": false,\r
+         "name" : "Anyagok törlése",\r
+      "template": "delete-materials.xml",\r
+      "executeimmediate": true,\r
+      "cronexpression": "0 0 0/1 1/1 * ? *",\r
+      "parameters": [ \r
+       {"name": "sourcePath", "value": "\\\\10.10.1.100\\BRAAVOS\\ARCHIVE", "type": "java.lang.String"},\r
+       {"name": "userName", "value": "mediacube", "type": "java.lang.String"},\r
+       {"name": "password", "value": "Broadca5T", "type": "java.lang.String"}\r
+      ]\r
+       },      \r
+       {\r
+      "active": false,\r
+         "name" : "NEXIO anyagok törlése",\r
+      "template": "delete-nexio-materials.xml",\r
+      "executeimmediate": true,\r
+      "cronexpression": "0 0 0/1 1/1 * ? *",\r
+      "parameters": [ \r
+       {"name": "port", "value": 2098, "type": "java.lang.Integer"},\r
+       {"name": "userName", "value": "administrator", "type": "java.lang.String"},\r
+       {"name": "password", "value": "system", "type": "java.lang.String"},\r
+       {"name": "gracePeriodDays", "value": 1, "type": "java.lang.Integer"}\r
+      ]\r
+       },      \r
+       {\r
+      "active": true,\r
+         "name" : "OCTOPUS adatok szinkronizálása",\r
+      "template": "sync-octopus.xml",\r
+      "executeimmediate": true,\r
+      "cronexpression": "0 0/1 * * * ?"\r
+       },      \r
+       {\r
+      "active": false,\r
+         "name" : "Párhuzamosított teszt folyamat",\r
+      "template": "fake-concurrent.xml",\r
+      "executeimmediate": false,\r
+      "cronexpression": "0/10 * * ? * *",\r
+      "parameters": [ {"name": "itemID", "value": 1, "type": "java.lang.Long"} ]\r
+       },\r
+       {\r
+      "active": false,\r
+         "name" : "Teszt folyamat",\r
+      "template": "fake.xml",\r
+      "executeimmediate": false,\r
+      "cronexpression": "0/10 * * ? * *",\r
+      "parameters": [ {"name": "itemID", "value": 1, "type": "java.lang.Long"} ]\r
+       }\r
+]}\r
+\r
+\r
+\r

diff --git a/server/user.jobengine.executors/deploy-steps-to-bsh.bat b/server/user.jobengine.executors/deploy-steps-to-bsh.bat
index 77ff5dd3a9574eb47576922057a6b458ebfa3fb1..288eec446e69f601d4f2978c03208066792aaddb 100644 (file)
--- 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\r
        \r
        WinSCP.com /command ^\r
-       "open %REMOTE_SERVER_ADDRESS% -hostkey=""%REMOTE_SERVER_HOSTKEY%""" ^\r
+       "open %REMOTE_SERVER_ADDRESS% -hostkey=""%REMOTE_SERVER_HOSTKEY%"" -timeout=60" ^\r
        "cd %REMOTE_LOCATION%" ^\r
        "lcd %LOCAL_STEPS_LOCATION%" ^\r
        "synchronize remote" ^\r
@@ -22,6 +22,8 @@ SET LOCAL_CONFIG_LOCATION=config
        "lcd ..\" ^\r
        "lcd %LOCAL_CONFIG_LOCATION%" ^\r
        "synchronize remote -filemask=config.xml" ^\r
+       "cd .." ^\r
+       "synchronize remote -filemask=scheduledjobs.json" ^\r
        "call pcs resource restart mediacube_script" ^\r
        "exit"\r
        \r

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 0e9d301d237cee785d4e0e3686024473b0e874cd..37b8bd19a03144f9c0e4b8b5302780a87e6ddd6e 100644 (file)
--- 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 {
        }\r
 \r
        private void processMediaId(String mediaId) throws Exception {\r
-               List<IEntityBase> medias = dao.getByHouseId(mediaId);\r
+               List<IEntityBase> medias = dao.getByHouseId(mediaId + ".MXF");\r
                if (medias == null || medias.size() == 0) {\r
                        logger.error(getMarker(), "Az {} anyag nem található az archívumban.", mediaId);\r
                        return;\r
                }\r
 \r
-               if (medias.size() > 0) {\r
+               if (medias.size() > 1) {\r
                        logger.error(getMarker(), "Az {} anyagból egynél több található az archívumban.", mediaId);\r
                        return;\r
                }\r
@@ -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());\r
                }\r
 \r
-               if (!csvFile.delete())\r
-                       logger.error(getMarker(), "A {} MORPHEUS állomány nem törölhető.", csvFile.getName());\r
+               //TODO ne törölje, move\r
+               //              if (!csvFile.delete())\r
+               //                      logger.error(getMarker(), "A {} MORPHEUS állomány nem törölhető.", csvFile.getName());\r
        }\r
 \r
        private void setAndCheck(String sourcePath, String targetPath, IJobEngine jobEngine) {\r
@@ -123,6 +124,8 @@ public class CheckMORPHEUSMissingMaterialsStep extends JobStep {
                        logger.error(getMarker(), "Az folyamatkezelő réteg nem elérhető.");\r
                        throw new NullPointerException("Internal error, missing JobEngine reference.");\r
                }\r
+               this.jobEngine = jobEngine;\r
+\r
                IItemManager manager = jobEngine.getItemManager();\r
                if (manager == null) {\r
                        logger.error(getMarker(), "Az adatbáziskezelő réteg nem elérhető.");\r

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 97614b643beed4bd53a26294e3500225e65a0a46..183fb31143ec76cdb2ed6d9a35bda5b0aab1dcc3 100644 (file)
--- 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));\r
                DBCollection collection = db.getCollection(RUNDOWN_COLLECTION_NAME);\r
                if (lastUpdateTime == null || (lastUpdateTime != null && isModified(lastUpdateTime, rundown))) {\r
-                       logger.info(SAVING_RUNDOWN, rundownID, name);\r
+                       logger.debug(SAVING_RUNDOWN, rundownID, name);\r
                        collection.save(rundown);\r
                }\r
                logger.trace(EXIT);\r
@@ -578,7 +578,7 @@ public class OctopusDataMiner implements Runnable {
                List<BasicDBObject> rundownsList = NoSQLUtils.asList(rundowns);\r
                int idx = 1;\r
                for (BasicDBObject rundown : rundownsList) {\r
-                       logger.info(String.format(CHECKING_RUNDOWN_S_D_D, rundown.getLong(ID), rundownsList.size(), idx));\r
+                       logger.debug(String.format(CHECKING_RUNDOWN_S_D_D, rundown.getLong(ID), rundownsList.size(), idx));\r
                        storeRundown(rundown, lastUpdateTime);\r
                        int progress = idx * 50 / rundownsList.size();\r
                        if (progress - progressEvent.getProgress() > 0) {\r
@@ -647,7 +647,7 @@ public class OctopusDataMiner implements Runnable {
                                story.remove(MOS_OBJECTS);\r
                } else\r
                        story.put(MOS_OBJECTS, modifiedMOS);\r
-               logger.info(SAVING_STORY_ID, storyID);\r
+               logger.debug(SAVING_STORY_ID, storyID);\r
                collection.save(story);\r
                logger.trace(EXIT);\r
        }\r
@@ -674,7 +674,7 @@ public class OctopusDataMiner implements Runnable {
                List<BasicDBObject> storyFolderList = NoSQLUtils.asList(storyFolders);\r
                int idx = 1;\r
                for (BasicDBObject storyFolder : storyFolderList) {\r
-                       logger.info(String.format(CHECKING_STORY_FOLDER_S_D_D, storyFolder.getLong(ID), storyFolderList.size(), idx));\r
+                       logger.debug(String.format(CHECKING_STORY_FOLDER_S_D_D, storyFolder.getLong(ID), storyFolderList.size(), idx));\r
                        storeStoryFolder(storyFolder, lastUpdateTime);\r
                        int progress = 50 + (idx * 50 / storyFolderList.size());\r
                        if (progress - progressEvent.getProgress() > 0) {\r

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 b3286f1b4ddb12bd50774fa06c8ea60e50e95a95..aa1336d9fa3ec597c76af39951adf57329b3679b 100644 (file)
--- 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());
        }