https://git.useribm.hu / mediacube.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 591f800)
git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Tue, 26 Nov 2019 12:10:11 +0000 (12:10 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Tue, 26 Nov 2019 12:10:11 +0000 (12:10 +0000)
server/user.commons.log4j2/src/user/commons/log4j2/appender/SmtpManager.java patch | blob | history
server/user.jobengine.executors/src/user/jobengine/server/steps/CreateMissingLowresStep.java patch | blob | history
server/user.jobengine.osgi.commons/src/user/commons/MediaCubeUndoMarker.java [new file with mode: 0644] patch | blob

diff --git a/server/user.commons.log4j2/src/user/commons/log4j2/appender/SmtpManager.java b/server/user.commons.log4j2/src/user/commons/log4j2/appender/SmtpManager.java
index 6b7b9fc058671f882431187649e231f3768a145a..7b7e9e246efcb70790993db52f20988e47a8c66a 100644 (file)
--- a/server/user.commons.log4j2/src/user/commons/log4j2/appender/SmtpManager.java
+++ b/server/user.commons.log4j2/src/user/commons/log4j2/appender/SmtpManager.java
@@ -59,6 +59,7 @@ import org.apache.logging.log4j.util.Strings;
 
 import user.commons.MediaCubeFinishMarker;
 import user.commons.MediaCubeMarker;
+import user.commons.MediaCubeUndoMarker;
 
 /**
  * Manager for sending SMTP events.
@@ -318,6 +319,11 @@ public class SmtpManager extends AbstractManager {
                        return;
                }
 
+               if (appendEvent.getMarker() instanceof MediaCubeUndoMarker) {
+                       undoSessionEvents((MediaCubeMarker) appendEvent.getMarker());
+                       return;
+               }
+
                if (appendEvent.getMarker() instanceof MediaCubeMarker) {
                        MediaCubeMarker mcm = (MediaCubeMarker) appendEvent.getMarker();
                        if (mcm.getSessionID() == null) {
@@ -383,6 +389,11 @@ public class SmtpManager extends AbstractManager {
                events.add(appendEvent);
        }
 
+       private void undoSessionEvents(final MediaCubeMarker mcm) {
+               String sessionID = mcm.getSessionID();
+               sessionEvents.remove(sessionID);
+       }
+
        protected void writeBuffer(List<LogEvent> events, final Layout<?> layout, final OutputStream out) throws IOException {
                out.write("<html>".getBytes());
                out.write("<body>".getBytes());
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CreateMissingLowresStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CreateMissingLowresStep.java
index 9c4d021dd8b611fa77bf20836d9a072f11a229cb..2d76a1b82785a8b34167a48b1d15393fa4e4a753 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CreateMissingLowresStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CreateMissingLowresStep.java
@@ -4,36 +4,39 @@ import java.nio.file.Paths;
 \r
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
-import org.apache.logging.log4j.Marker;\r
 \r
 import com.ibm.nosql.json.api.BasicDBObject;\r
 import com.ibm.nosql.json.api.DB;\r
 import com.ibm.nosql.json.api.DBCollection;\r
 \r
+import user.commons.MediaCubeMarker;\r
+import user.commons.MediaCubeUndoMarker;\r
 import user.commons.nosql.NoSQLUtils;\r
 import user.jobengine.db.IItemManager;\r
 import user.jobengine.db.Media;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.messages.CancelRequest;\r
 \r
 public class CreateMissingLowresStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r
-       private Marker marker;\r
-       private long highresStoreId;\r
+       private MediaCubeMarker marker;\r
 \r
        @StepEntry\r
        public Object[] execute(String localHiresPath, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
                Object[] result = { null, null, "%s", null, 0, true };\r
-               marker = jobRuntime.getMarker();\r
+               marker = (MediaCubeMarker) jobRuntime.getMarker();\r
                DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection collection = db.getCollection("missing_lowres");\r
                IItemManager manager = jobEngine.getItemManager();\r
-               highresStoreId = manager.getSystemStore(false).getId();\r
                Media media = getFirstUntranscodedMedia(manager, collection);\r
 \r
                try {\r
                        if (media == null) {\r
-                               throw new Exception("Nincs feldolgozandó hiány.");\r
+                               logger.info(new MediaCubeUndoMarker(marker.getSessionID()), "Nincs feldolgozandó hiány.");\r
+                               //                              throw new Exception("Nincs feldolgozandó hiány.");\r
+                               jobEngine.sendMessage(new CancelRequest(jobRuntime.getId()));\r
+                               return null;\r
                        }\r
 \r
                        String name = media.getMediaFilesName();\r
diff --git a/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeUndoMarker.java b/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeUndoMarker.java
new file mode 100644 (file)
index 0000000..1668503
--- /dev/null
+++ b/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeUndoMarker.java
@@ -0,0 +1,8 @@
+package user.commons;\r
+\r
+@SuppressWarnings("serial")\r
+public class MediaCubeUndoMarker extends MediaCubeMarker {\r
+       public MediaCubeUndoMarker(String sessionID) {\r
+               setSessionID(sessionID);\r
+       }\r
+}\r
mediacube repository