From 7d95fea0b3840a4295acbfa0aa1b7881e36e9be6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?=
 <daniel.vasary@userrendszerhaz.hu>
Date: Fri, 18 Jan 2019 13:28:24 +0000
Subject: [PATCH] =?utf8?q?#122=20Email=20t=C3=A1rgy=20mez=C5=91=20az=20API?=
 =?utf8?q?-ban?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31389
---
 .../user/commons/log4j2/appender/SmtpManager.java |  5 ++++-
 .../src/user/commons/MediaCubeMarker.java         | 15 +++++++++++++++
 .../osgi/mediacube/MediaCubeService.java          |  4 ++--
 3 files changed, 21 insertions(+), 3 deletions(-)

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 ecb88afa..6b7b9fc0 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
@@ -310,6 +310,7 @@ public class SmtpManager extends AbstractManager {
 
 		//System.out.println(appendEvent.getMarker().getClass().getSimpleName() + " " + new String(layout.toByteArray(appendEvent)));
 		String to = defaultRecipient;
+		String subject = defaultSubject;
 		if (appendEvent.getMarker() instanceof MediaCubeFinishMarker) {
 			MediaCubeFinishMarker mcm = (MediaCubeFinishMarker) appendEvent.getMarker();
 			storeSessionEvent(mcm, appendEvent);
@@ -322,6 +323,8 @@ public class SmtpManager extends AbstractManager {
 			if (mcm.getSessionID() == null) {
 				if (mcm.getTo() != null)
 					to = mcm.getTo();
+				if (mcm.getSubject() != null)
+					subject = mcm.getSubject();
 			} else {
 				storeSessionEvent(mcm, appendEvent);
 				return;
@@ -329,7 +332,7 @@ public class SmtpManager extends AbstractManager {
 
 		}
 
-		sendEvents(to, defaultSubject, layout, Arrays.asList(appendEvent));
+		sendEvents(to, subject, layout, Arrays.asList(appendEvent));
 	}
 
 	private void sendEvents(final String to, final String subject, final Layout<?> layout, final List<LogEvent> events) {
diff --git a/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeMarker.java b/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeMarker.java
index 52805004..f5a1ffa3 100644
--- a/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeMarker.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeMarker.java
@@ -6,6 +6,7 @@ import org.apache.logging.log4j.MarkerManager.Log4jMarker;
 public class MediaCubeMarker extends Log4jMarker {
 	private static final String MEDIACUBE = "MEDIACUBE";
 	private String to;
+	private String subject;
 	private String sessionID;
 	private String sessionName;
 
@@ -18,6 +19,12 @@ public class MediaCubeMarker extends Log4jMarker {
 		this.to = to;
 	}
 
+	public MediaCubeMarker(String to, String subject) {
+		super(MEDIACUBE);
+		this.to = to;
+		this.subject = subject;
+	}
+
 	public String getSessionID() {
 		return sessionID;
 	}
@@ -42,6 +49,14 @@ public class MediaCubeMarker extends Log4jMarker {
 		this.to = to;
 	}
 
+	public String getSubject() {
+		return subject;
+	}
+
+	public void setSubject(String subject) {
+		this.subject = subject;
+	}
+
 	//	@Override
 	//	public boolean equals(Object o) {
 	//		if (o == null || !o.getClass().equals(MediaCubeMarker.class))
diff --git a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/mediacube/MediaCubeService.java b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/mediacube/MediaCubeService.java
index 4d2d4db3..b9b45aba 100644
--- a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/mediacube/MediaCubeService.java
+++ b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/mediacube/MediaCubeService.java
@@ -159,10 +159,10 @@ public class MediaCubeService {
 	@GET
 	@Path("/notify")
 	@Consumes({ MediaType.APPLICATION_JSON })
-	public Response notify(@QueryParam("to") String to, @QueryParam("content") String content) {
+	public Response notify(@QueryParam("to") String to, @QueryParam("subject") String subject, @QueryParam("content") String content) {
 		Response result = null;
 		try {
-			logger.info(new MediaCubeMarker(to), content);
+			logger.info(new MediaCubeMarker(to, subject), content);
 			result = Response.ok().build();
 		} catch (Exception e) {
 			result = Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();
-- 
2.54.0