From: Vásáry Dániel Date: Tue, 26 Nov 2019 12:10:11 +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=09fd68cf490ab12b18376c35cb40c55df85353a9;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31646 --- 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 6b7b9fc0..7b7e9e24 100644 --- 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 events, final Layout layout, final OutputStream out) throws IOException { out.write("".getBytes()); out.write("".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 9c4d021d..2d76a1b8 100644 --- 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; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.Marker; import com.ibm.nosql.json.api.BasicDBObject; import com.ibm.nosql.json.api.DB; import com.ibm.nosql.json.api.DBCollection; +import user.commons.MediaCubeMarker; +import user.commons.MediaCubeUndoMarker; import user.commons.nosql.NoSQLUtils; import user.jobengine.db.IItemManager; import user.jobengine.db.Media; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.messages.CancelRequest; public class CreateMissingLowresStep extends JobStep { private static final Logger logger = LogManager.getLogger(); - private Marker marker; - private long highresStoreId; + private MediaCubeMarker marker; @StepEntry public Object[] execute(String localHiresPath, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception { Object[] result = { null, null, "%s", null, 0, true }; - marker = jobRuntime.getMarker(); + marker = (MediaCubeMarker) jobRuntime.getMarker(); DB db = NoSQLUtils.getNoSQLDB(); DBCollection collection = db.getCollection("missing_lowres"); IItemManager manager = jobEngine.getItemManager(); - highresStoreId = manager.getSystemStore(false).getId(); Media media = getFirstUntranscodedMedia(manager, collection); try { if (media == null) { - throw new Exception("Nincs feldolgozandÃ³ hiÃ¡ny."); + logger.info(new MediaCubeUndoMarker(marker.getSessionID()), "Nincs feldolgozandÃ³ hiÃ¡ny."); + // throw new Exception("Nincs feldolgozandÃ³ hiÃ¡ny."); + jobEngine.sendMessage(new CancelRequest(jobRuntime.getId())); + return null; } String name = media.getMediaFilesName(); 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 index 00000000..1668503b --- /dev/null +++ b/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeUndoMarker.java @@ -0,0 +1,8 @@ +package user.commons; + +@SuppressWarnings("serial") +public class MediaCubeUndoMarker extends MediaCubeMarker { + public MediaCubeUndoMarker(String sessionID) { + setSessionID(sessionID); + } +}