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

diff --git a/server/-configuration/run-mediacube-server-hirtv.launch b/server/-configuration/run-mediacube-server-hirtv.launch
index 4f2f3d81b1d7c6130edb99066ae77b97c6bd30bc..2716732a343176e81b55249b77f52f2feef9fa16 100644 (file)
--- a/server/-configuration/run-mediacube-server-hirtv.launch
+++ b/server/-configuration/run-mediacube-server-hirtv.launch
@@ -21,7 +21,7 @@
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>\r
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>\r
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dcom.sun.management.jmxremote&#13;&#10;-Dcom.sun.management.jmxremote.port=9010&#13;&#10;-Dcom.sun.management.jmxremote.local.only=false&#13;&#10;-Dcom.sun.management.jmxremote.authenticate=false&#13;&#10;-Dcom.sun.management.jmxremote.ssl=false&#13;&#10;-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dlog4j.configurationFile=settings/log4j2.xml&#13;&#10;-Djetty.home=settings/jetty&#13;&#10;-Djetty.etc.config.urls=jetty.xml,jetty-ssl.xml,jetty-ssl-context.xml,jetty-http.xml,jetty-https.xml&#13;&#10;-Dgosh.home=configuration&#13;&#10;-Djava.io.tmpdir=tmp"/>\r
-    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="C:\_workspace\USER\MediaCube\server\-product\production\HIRTV"/>\r
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}\-product\production\HIRTV"/>\r
     <stringAttribute key="pde.version" value="3.3"/>\r
     <setAttribute key="selected_target_bundles">\r
         <setEntry value="cglib@default:default"/>\r
@@ -36,7 +36,6 @@
         <setEntry value="com.ibm.db2.jcc@default:default"/>\r
         <setEntry value="com.ibm.nosql@default:default"/>\r
         <setEntry value="com.microsoft.sqlserver.sqljdbc@default:default"/>\r
-        <setEntry value="com.sun.jna.platform@default:default"/>\r
         <setEntry value="com.sun.jna@default:default"/>\r
         <setEntry value="groovy@default:default"/>\r
         <setEntry value="io.humble.video-arch-x86_64-pc-linux-gnu6@default:default"/>\r

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 4c6b7a7f45184c3db9572551df90c1debb898be2..b974797f27b534a1fb7132664707fad585054046 100644 (file)
--- 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\r
        public Object[] execute(int nexioPort, String nexioUserName, String nexioPassword, String archiveFtp, String archiveUserName, String archivePassword,\r
                        int daysBeforeNow, int nexioKillDateDays, String nexioAgency, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
-               systemMarker = jobRuntime.getSessionMarker();\r
+               systemMarker = getMarker();\r
+               logger.info(systemMarker, "test");\r
                setAndCheck(nexioPort, nexioUserName, nexioPassword, archiveFtp, archiveUserName, archivePassword, nexioKillDateDays, nexioAgency, jobEngine);\r
                octopusAPI = new OctopusAPI();\r
                Calendar scheduledDate = Calendar.getInstance();\r
@@ -217,26 +218,26 @@ public class CopyForArchiveNEXIOMaterialsStep extends JobStep {
        private FileArchive processMosObject(BasicDBObject rundown, BasicDBObject story, BasicDBObject mosObject) throws Exception {\r
                String mosID = mosObject.getString(IOctopusAPI.OBJ_ID);\r
                if (MetadataTypeDetector.GuessMetadataType(mosID) != MetadataType.OctopusPlaceholder) {\r
-                       logger.trace("Skipping MOS object {}", mosID);\r
+                       logger.trace(systemMarker, "Skipping MOS object {}", mosID);\r
                        return null;\r
                }\r
                DBCollection clips = db.getCollection(NEXIOCLIPS);\r
                BasicDBObject clip = (BasicDBObject) clips.findOne(new BasicDBObject(LONGNAMEID, mosID));\r
                if (clip == null) {\r
-                       logger.debug("File {} NOT exists", mosID);\r
+                       logger.debug(systemMarker, "File {} NOT exists", mosID);\r
                        return null;\r
                        //throw new Exception(String.format("File NOT exists %s", mosID));\r
                } else {\r
-                       logger.debug("File {} exists", mosID);\r
+                       logger.debug(systemMarker, "File {} exists", mosID);\r
                }\r
                long duration = NoSQLUtils.asLong(clip, DURATION);\r
 \r
                if (duration == 0) {\r
-                       logger.debug("File {} exists with 0 frame length", mosID);\r
+                       logger.debug(systemMarker, "File {} exists with 0 frame length", mosID);\r
                        return null;\r
                }\r
                if (duration == 1) {\r
-                       logger.debug("File {} exists with 1 frame length", mosID);\r
+                       logger.debug(systemMarker, "File {} exists with 1 frame length", mosID);\r
                        return null;\r
                }\r
                return new FileArchive(mosID, duration);\r
@@ -246,7 +247,7 @@ public class CopyForArchiveNEXIOMaterialsStep extends JobStep {
                BasicDBObject rundown = (BasicDBObject) r;\r
                long rundownID = rundown.getLong(ID);\r
                if (!demo)\r
-                       logger.info("Processing rundown {} {}", rundownID, rundown.getString(IOctopusAPI.NAME));\r
+                       logger.info(systemMarker, "Processing rundown {} {}", rundownID, rundown.getString(IOctopusAPI.NAME));\r
                List<DBObject> stories = octopusAPI.getRundownFullStories(rundownID);\r
                if (stories == null)\r
                        return null;\r
@@ -282,30 +283,31 @@ public class CopyForArchiveNEXIOMaterialsStep extends JobStep {
                //db.getCollection(ARCHIVEDRUNDOWNS).drop();\r
                List<BasicDBObject> archivedRundowns = queryArchivedRundowns();\r
 \r
-               logger.info(getMarker(), "Found {} rundowns to archive", archivedRundowns.size());\r
+               logger.info(systemMarker, "Found {} rundowns to archive", archivedRundowns.size());\r
                int index = 1;\r
 \r
                for (DBObject r : rundowns) {\r
                        BasicDBObject rundown = (BasicDBObject) r;\r
-                       setProgress(index * 100 / rundowns.size());\r
+                       int progress = index * 100 / rundowns.size();\r
+                       setProgress(progress);\r
                        long rundownID = NoSQLUtils.asLong(rundown, IOctopusAPI.ID);\r
                        String rundownName = NoSQLUtils.asString(rundown, IOctopusAPI.NAME);\r
                        try {\r
                                BasicDBObject currentRundownID = new BasicDBObject(IOctopusAPI.ID, rundownID);\r
                                if (!demo && archivedRundowns != null && archivedRundowns.contains(currentRundownID)) {\r
-                                       logger.info("Skipping archived rundown {} {}", rundownID, rundownName);\r
+                                       logger.info(systemMarker, "Skipping archived rundown {} {}", rundownID, rundownName);\r
                                        continue;\r
                                }\r
 \r
                                RundownArchive rundownArchive = processRundow(r);\r
                                if (rundownArchive == null || rundownArchive.isEmpty()) {\r
                                        if (!demo)\r
-                                               logger.info("Skipping rundown {} {}", rundownID, rundownName);\r
+                                               logger.info(systemMarker, "Skipping rundown {} {}", rundownID, rundownName);\r
                                        continue;\r
                                }\r
 \r
                                if (!demo)\r
-                                       logger.info("Saving rundown {} {}", rundownID, rundownName);\r
+                                       logger.info(systemMarker, "Saving rundown {} {}", rundownID, rundownName);\r
                                copy(rundownArchive);\r
                                if (!demo)\r
                                        logger.info(systemMarker, "A '{}' tükör {}db bejátszójának archiválása sikeres volt", rundownArchive.getItemTitle(),\r
@@ -328,13 +330,16 @@ public class CopyForArchiveNEXIOMaterialsStep extends JobStep {
                BasicDBObject story = (BasicDBObject) s;\r
                String parentStoryID = story.getString(IOctopusAPI.PARENT_STORY_ID);\r
                if (StringUtils.isBlank(parentStoryID)) {\r
-                       logger.warn("Story parentStoryID is null: {}", story.toPrettyString(null));\r
+                       logger.warn(systemMarker, "Story parentStoryID is null: {}", story.toPrettyString(null));\r
                        return null;\r
                } else\r
-                       logger.debug("Processing story {}", parentStoryID);\r
+                       logger.info(systemMarker, "Processing story {}", parentStoryID);\r
                List<BasicDBObject> mosObjects = NoSQLUtils.asList(story, IOctopusAPI.MOS_OBJECTS);\r
-               if (mosObjects == null)\r
+               if (mosObjects == null) {\r
+                       logger.info(systemMarker, "No MOS in story {}: {}", parentStoryID, story.toPrettyString(null));\r
+                       \r
                        return null;\r
+               }\r
                StoryArchive storyArchive = null;\r
                for (BasicDBObject mosObject : mosObjects) {\r
                        FileArchive fileArchive = processMosObject(rundown, story, mosObject);\r