#122 Email tárgy mező az API-ban

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

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 ecb88afa3d2bacae12e76ed2faca8a80fae37b5a..6b7b9fc058671f882431187649e231f3768a145a 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
@@ -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 52805004ec37f29d26899bf7bd947bc577c733af..f5a1ffa3c54a76d30379e230a0e72056019e33fa 100644 (file)
--- 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 {\r
        private static final String MEDIACUBE = "MEDIACUBE";\r
        private String to;\r
+       private String subject;\r
        private String sessionID;\r
        private String sessionName;\r
 \r
@@ -18,6 +19,12 @@ public class MediaCubeMarker extends Log4jMarker {
                this.to = to;\r
        }\r
 \r
+       public MediaCubeMarker(String to, String subject) {\r
+               super(MEDIACUBE);\r
+               this.to = to;\r
+               this.subject = subject;\r
+       }\r
+\r
        public String getSessionID() {\r
                return sessionID;\r
        }\r
@@ -42,6 +49,14 @@ public class MediaCubeMarker extends Log4jMarker {
                this.to = to;\r
        }\r
 \r
+       public String getSubject() {\r
+               return subject;\r
+       }\r
+\r
+       public void setSubject(String subject) {\r
+               this.subject = subject;\r
+       }\r
+\r
        //      @Override\r
        //      public boolean equals(Object o) {\r
        //              if (o == null || !o.getClass().equals(MediaCubeMarker.class))\r

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 4d2d4db3f697cf13057b562fc674a33d63f9008d..b9b45abae2a840167cbd2901261396d06dc85945 100644 (file)
--- 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\r
        @Path("/notify")\r
        @Consumes({ MediaType.APPLICATION_JSON })\r
-       public Response notify(@QueryParam("to") String to, @QueryParam("content") String content) {\r
+       public Response notify(@QueryParam("to") String to, @QueryParam("subject") String subject, @QueryParam("content") String content) {\r
                Response result = null;\r
                try {\r
-                       logger.info(new MediaCubeMarker(to), content);\r
+                       logger.info(new MediaCubeMarker(to, subject), content);\r
                        result = Response.ok().build();\r
                } catch (Exception e) {\r
                        result = Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();\r