git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Thu, 25 Jan 2018 13:48:45 +0000 (13:48 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Thu, 25 Jan 2018 13:48:45 +0000 (13:48 +0000)
22 files changed:
client/Maestro/Configuration/-configuration-transcoder.json [new file with mode: 0644]
client/Maestro/Configuration/configuration-tqc-check.json [deleted file]
client/Maestro/Maestro.csproj
client/Maestro/Program.cs
server/-configuration/scheduledjobs.json
server/user.commons.log4j2/src/user/commons/log4j2/appender/SmtpManager.java
server/user.jobengine.executors/jobtemplates/copyforarchive-nexio-recordings.xml
server/user.jobengine.executors/jobtemplates/delete-nexio-materials.xml
server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveMaterialSubmitStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIOMaterialsStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/DeleteNEXIOMaterialsStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/FakeNoParamsStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/FakeStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataTransformStep.java
server/user.jobengine.osgi.server/src/user/jobengine/server/IJobEngine.java
server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngine.java
server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java
server/user.jobengine.osgi.server/src/user/jobengine/server/actions/DoneExecutingAction.java
server/user.jobengine.osgi.server/src/user/jobengine/server/actions/DoneSuspendAction.java
server/user.jobengine.osgi.server/src/user/jobengine/server/actions/ExecuteRunableAction.java
server/user.jobengine.osgi.server/src/user/jobengine/server/actions/StatusMachine.java

diff --git a/client/Maestro/Configuration/-configuration-transcoder.json b/client/Maestro/Configuration/-configuration-transcoder.json
new file mode 100644 (file)
index 0000000..1292272
--- /dev/null
@@ -0,0 +1,118 @@
+{\r
+  "title": "TRANSCODER",\r
+  "active": true,\r
+  "startInTray": true,\r
+  "enableCustomMetadataId": true,\r
+  "defaultWindowColor": "#E3F2FD",\r
+  "partialWindowColor": "#BBDEFB",\r
+  "player": {\r
+    "enabled": true,\r
+    "autoStart": false,\r
+    "segmentEditor": true\r
+  },\r
+  "source": {\r
+    "$type": "UNCSource",\r
+    "filter": "avi,wav,mxf",\r
+    "local": {\r
+      "address": "file://10.10.1.100/braavos/TRANSCODER"\r
+    }\r
+  },\r
+  "metadatas": [\r
+    {\r
+      "$type": "OctopusMetadata",\r
+      "server": {\r
+        "address": "http://10.10.1.27/services/rest/octopus/",\r
+        "timeout": 1000\r
+      }\r
+    },\r
+    {\r
+      "$type": "TrafficMetadata",\r
+      "server": {\r
+        "address": "Data Source=10.10.1.45\\sql16;Initial Catalog=PA_Echo;Persist Security Info=True;",\r
+        "userName": "MAM",\r
+        "password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ",\r
+        "timeout": 1000\r
+      }\r
+    },\r
+    {\r
+      "$type": "MediaCubeMetadata",\r
+      "server": {\r
+        "address": "http://10.10.1.27/services/rest/jobengine/",\r
+        "timeout": 1000\r
+      }\r
+    }\r
+  ],\r
+  "targets": [\r
+    {\r
+      "label": "Octopus mappába küldés",\r
+      "processor": "FTPTargetProcessor",\r
+      "outputFormat": "%ID%-%SOURCENAME%",\r
+      "tag": "Betöltés",\r
+      "subFolderFormat": "%IDROOT%-%TEXT%",\r
+      "killDateDays": 7,\r
+      "saveArchiveMetadata": false,\r
+      "remote": {\r
+        "address": "ftp://10.10.1.100/OCTOPUS",\r
+        "userName": "mediacube",\r
+        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+        "timeout": 1000\r
+      }\r
+    },\r
+    {\r
+      "label": "Traffic mappába küldés",\r
+      "processor": "FTPTargetProcessor",\r
+      "outputFormat": "%ID%-%SOURCENAME%",\r
+      "tag": "Betöltés",\r
+      "subFolderFormat": "%IDROOT%-%TEXT%",\r
+      "killDateDays": 7,\r
+      "saveArchiveMetadata": false,\r
+      "remote": {\r
+        "address": "ftp://10.10.1.100/PLAYOUT_NLE",\r
+        "userName": "mediacube",\r
+        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+        "timeout": 1000\r
+      }\r
+    },\r
+  {\r
+      "label": "Reklám mappába küldés",\r
+      "processor": "FTPTargetProcessor",\r
+      "outputFormat": "%ID%-%SOURCENAME%",\r
+      "tag": "Betöltés",\r
+      "subFolderFormat": "%IDROOT%-%TEXT%/INGEST-%TIMESTAMP%",\r
+      "killDateDays": 14,\r
+      "saveArchiveMetadata": false,\r
+      "remote": {\r
+        "address": "ftp://10.10.1.100/REKLAM_NLE",\r
+        "userName": "mediacube",\r
+        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+        "timeout": 1000\r
+      }\r
+    },\r
+  {\r
+      "label": "Lebonyba küldés",\r
+      "processor": "FTPTargetProcessor",\r
+      "outputFormat": "%ID%",\r
+      "tag": "Lebony",\r
+      "killDateDays": 7,\r
+      "remote": {\r
+        "address": "ftp://10.10.1.100/TQC/CHECK",\r
+        "userName": "mediacube",\r
+        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+        "timeout": 1000\r
+      }\r
+    },\r
+    {\r
+      "label": "Archiválás",\r
+      "processor": "FTPTargetProcessor",\r
+      "outputFormat": "%ID%",\r
+      "tag": "Archiválás",\r
+      "saveArchiveMetadata": true,\r
+      "remote": {\r
+        "address": "ftp://10.10.1.100/ARCHIVE",\r
+        "userName": "mediacube",\r
+        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+        "timeout": 1000\r
+      }\r
+    }\r
+  ]\r
+}\r
diff --git a/client/Maestro/Configuration/configuration-tqc-check.json b/client/Maestro/Configuration/configuration-tqc-check.json
deleted file mode 100644 (file)
index 6989f70..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-{\r
-  "title": "TQC check",\r
-  "active": true,\r
-  "startInTray": false,\r
-  "enableCustomMetadataId": true,\r
-  "player": {\r
-    "enabled": true,\r
-    "autoStart": false,\r
-    "segmentEditor": true\r
-  },\r
-  "source": {\r
-    "$type": "UNCSource",\r
-    "filter": "avi,wav,mxf",\r
-    "local": {\r
-      "address": "file://10.10.1.100/BRAAVOS/TQC/CHECK",\r
-      "userName": "mediacube",\r
-      "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
-      "timeout": 1000\r
-    },\r
-    "remote": {\r
-      "address": "ftp://10.10.1.100/TQC/CHECK",\r
-      "userName": "mediacube",\r
-      "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
-      "timeout": 1000\r
-    }\r
-  },\r
-  "metadatas": [\r
-    {\r
-      "$type": "TrafficMetadata",\r
-      "server": {\r
-        "address": "Data Source=10.10.1.45\\sql16;Initial Catalog=PA_Echo;Persist Security Info=True;",\r
-        "userName": "MAM",\r
-        "password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ",\r
-        "timeout": 1000\r
-      }\r
-    },\r
-    {\r
-      "$type": "MediaCubeMetadata",\r
-      "server": {\r
-        "address": "http://10.10.1.27/services/rest/jobengine/",\r
-        "timeout": 1000\r
-      }\r
-    }\r
-  ],\r
-  "targets": [\r
-    {\r
-      "label": "Adáskész",\r
-      "processor": "FXPTargetProcessor",\r
-      "outputFormat": "%ID%",\r
-      "saveSegments": true,\r
-      "tag": "Adáskész",\r
-      "disableFileVersioning": true,\r
-      "enableOverride": true,\r
-      "saveMorpheusMetadata": true,\r
-      "pathMorpheusMetadata": "/PLAYOUT/MorpheusGateway/Input",\r
-      "deviceIdMorpheus": "ISILON",\r
-      "remote": {\r
-        "address": "ftp://10.10.1.100/PLAYOUT/Video",\r
-        "userName": "mediacube",\r
-        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
-        "timeout": 1000\r
-      }\r
-    },\r
-    {\r
-      "label": "Újravágás",\r
-      "processor": "FXPTargetProcessor",\r
-      "subFolderFormat": "%IDROOT%-%TEXT%",\r
-      "outputFormat": "%ID%-%TEXT%",\r
-      "tag": "Újravágás",\r
-      "disableFileVersioning": true,\r
-      "enableOverride": true,\r
-      "remote": {\r
-        "address": "ftp://10.10.1.100/PLAYOUT_NLE",\r
-        "userName": "mediacube",\r
-        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
-        "timeout": 1000\r
-      },\r
-      "sendEmailOnSuccess": true,\r
-      "successEmailRecipient": "vasary@elgekko.net",\r
-      "successEmailPattern": "A %TARGETNAME% újravágása szükséges."\r
-    },\r
-    {\r
-      "label": "Archiválás",\r
-      "processor": "FXPTargetProcessor",\r
-      "outputFormat": "%ID%",\r
-      "tag": "Archiválás",\r
-      "saveArchiveMetadata": true,\r
-      "disableFileVersioning": true,\r
-      "enableOverride": true,\r
-      "remote": {\r
-        "address": "ftp://10.10.1.100/ARCHIVE",\r
-        "userName": "mediacube",\r
-        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
-        "timeout": 1000\r
-      }\r
-    }\r
-  ]\r
-}\r
index 69d690b4e5de104fb0ed43798a220c2d061c4311..edf46e53201ae0488d71b9ab9c57527426f8080a 100644 (file)
     <None Include="Configuration\-configuration-grafika.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
-    <None Include="Configuration\configuration-tqc-check.json">\r
+    <None Include="Configuration\-configuration-transcoder.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
     <None Include="Configuration\global.json">\r
index ff4bb750de72e3c794e5f1ed2e88ab8bdb9f9a3e..b0e97ce922190eb2ce3cca3b180957c68289bbb8 100644 (file)
@@ -6,7 +6,6 @@ using NLog;
 using System;\r
 using System.Collections.Concurrent;\r
 using System.Collections.Generic;\r
-using System.Diagnostics;\r
 using System.DirectoryServices.AccountManagement;\r
 using System.IO;\r
 using System.Linq;\r
@@ -14,7 +13,6 @@ using System.Reflection;
 using System.Runtime.InteropServices;\r
 using System.Security.AccessControl;\r
 using System.Security.Principal;\r
-using System.Text.RegularExpressions;\r
 using System.Threading;\r
 using System.Threading.Tasks;\r
 using System.Windows.Forms;\r
@@ -22,6 +20,7 @@ using System.Windows.Forms;
 namespace Maestro {\r
 \r
     static class Program {\r
+        private static Logger logger = LogManager.GetCurrentClassLogger();\r
 \r
         /// <summary>\r
         /// The main entry point for the application.\r
@@ -61,7 +60,7 @@ namespace Maestro {
                             Application.Run(context);\r
                         }\r
                         catch (Exception e) {\r
-                            Debug.WriteLine(e.Message);\r
+                            logger.Error(e);\r
                             MessageBox.Show(new Form() { TopMost = true }, e.Message);\r
                         }\r
                         finally {\r
@@ -77,18 +76,19 @@ namespace Maestro {
     }\r
 \r
     public class TrayApplicationContext : ApplicationContext {\r
+        private static Logger logger = LogManager.GetCurrentClassLogger();\r
         private const string GLOBAL_JSON = "global.json";\r
         private const string AUDIORECORDER_JSON = "audiorecorder.json";\r
         private const string JSON_WILDCARD = "*.json";\r
         private const string CONFIG_ERROR = "Nem található aktív konfiguráció.";\r
         private const string SYSCONFIG_ERROR = "Nem található a 'global.json' rendszer konfiguráció.";\r
+        private const string SYSCONFIG_DOMAIN_ERROR = "Nem található a 'global.json' rendszer konfigurációban a tartományhitelesítő beállítása.";\r
         private const string CONFIGURATION_FOLDER = "./Configuration";\r
         private const string DOMAIN_QUERY_ERROR = "A bejelentkezett felhasználó domain információja nem elérhető.";\r
         private const string NOSPLASH = "nosplash";\r
         private const string NOLOGIN = "nologin";\r
         public const string NOSINGLE = "nosingle";\r
         private const string HYPHEN = "-";\r
-        private static Logger logger = LogManager.GetCurrentClassLogger();\r
         private NotifyIcon trayIcon;\r
         private ConcurrentBag<MeastroFormNotifyIcon> forms = new ConcurrentBag<MeastroFormNotifyIcon>();\r
         private IMessageBus messageBus = new MessageBus();\r
@@ -154,6 +154,9 @@ namespace Maestro {
             if (userInfo.Length < 2)\r
                 throw new Exception(DOMAIN_QUERY_ERROR);\r
             string userDomainName = userInfo[0];\r
+\r
+            logger.Info("User is authenticated by domain: {0}", userDomainName);\r
+\r
             if (userDomainName.Contains("."))\r
                 userDomainName = userDomainName.Split('.')[0];\r
             if (domainName.ToLower().Equals(userDomainName.ToLower()))\r
@@ -163,23 +166,28 @@ namespace Maestro {
 \r
         private void CheckUser() {\r
             string globalFile = Path.Combine(CONFIGURATION_FOLDER, GLOBAL_JSON);\r
-            string domainName = GlobalConfig.UserDomain.Address.ToString();\r
+            string domainName = GlobalConfig?.UserDomain?.Address?.ToString();\r
             if (String.IsNullOrEmpty(domainName))\r
-                throw new Exception(SYSCONFIG_ERROR);\r
+                throw new Exception(SYSCONFIG_DOMAIN_ERROR);\r
             else {\r
                 UserName = WindowsIdentity.GetCurrent().Name;\r
-                if (IsDomainUser(UserName, domainName))\r
+                logger.Debug("Current user is: {0}", UserName);\r
+                if (IsDomainUser(UserName, domainName)) {\r
+                    logger.Debug("User automatically accepted");\r
                     return;\r
-                UserName = GlobalConfig.UserDomain.UserName;\r
+                }\r
+                UserName = GlobalConfig.UserDomain?.UserName;\r
                 if (HasCommandlineParameter(NOLOGIN))\r
                     return;\r
-                string password = GlobalConfig.UserDomain.Password;\r
+                string password = GlobalConfig.UserDomain?.Password;\r
                 LoginForm loginForm = null;\r
                 try {\r
                     using (PrincipalContext pc = new PrincipalContext(ContextType.Domain, domainName)) {\r
                         while (true) {\r
+                            logger.Debug("Trying authenticate user {0}", UserName);\r
                             bool isValid = pc.ValidateCredentials(UserName, password);\r
                             if (isValid) {\r
+                                logger.Debug("Authenticated: {0}", UserName);\r
                                 break;\r
                             }\r
 \r
index 403db8ebeb7c370ecb8a161df1a9fe95fc88fa39..bda37e10ad3fd2102679d87746336af562392395 100644 (file)
        {"name": "archiveFtp", "value": "ftp://10.10.1.100/ARCHIVE/TEST", "type": "java.lang.String"},\r
        {"name": "archiveUserName", "value": "mediacube", "type": "java.lang.String"},\r
        {"name": "archivePassword", "value": "Broadca5T", "type": "java.lang.String"},\r
-       {"name": "agencies", "value": "schedule-rec", "type": "java.lang.String"},\r
+       {"name": "filterAgencies", "value": "schedule-rec", "type": "java.lang.String"},\r
        {"name": "limit", "value": 10, "type": "java.lang.Integer"},\r
        {"name": "nexioKillDateDays", "value": 7, "type": "java.lang.Integer"},\r
        {"name": "nexioAgency", "value": "ARCHIVED", "type": "java.lang.String"}\r
       ]\r
        },      \r
        {\r
+      "active": true,\r
+      "executeimmediate": false,\r
+         "name" : "Lejárt NEXIO anyagok törlése",\r
+      "template": "delete-nexio-materials.xml",\r
+      "cronexpression": "0 0 10 * * ?",\r
+      "parameters": [ \r
+       {"name": "port", "value": 2098, "type": "java.lang.Integer"},\r
+       {"name": "userName", "value": "administrator", "type": "java.lang.String"},\r
+       {"name": "password", "value": "system", "type": "java.lang.String"},\r
+       {"name": "filterAgencies", "value": "ARCHIVED", "type": "java.lang.String"},\r
+       {"name": "gracePeriodDays", "value": 1, "type": "java.lang.Integer"},\r
+       {"name": "notificationOnly", "value": true, "type": "java.lang.Boolean"}\r
+      ]\r
+       },      \r
+       {\r
       "active": false,\r
          "name" : "TRAFFIC anyagok visszatöltése",\r
       "template": "retrieve-traffic-missing-materials.xml",\r
       ]\r
        },      \r
        {\r
-      "active": false,\r
-         "name" : "NEXIO anyagok törlése",\r
-      "template": "delete-nexio-materials.xml",\r
-      "executeimmediate": true,\r
-      "cronexpression": "0 0 0/1 1/1 * ? *",\r
-      "parameters": [ \r
-       {"name": "port", "value": 2098, "type": "java.lang.Integer"},\r
-       {"name": "userName", "value": "administrator", "type": "java.lang.String"},\r
-       {"name": "password", "value": "system", "type": "java.lang.String"},\r
-       {"name": "gracePeriodDays", "value": 12, "type": "java.lang.Integer"}\r
-      ]\r
-       },      \r
-       {\r
       "active": false,\r
          "name" : "OCTOPUS adatok szinkronizálása",\r
       "template": "sync-octopus.xml",\r
index aa4a792d53cc6d4100206e48efc3ec6a41ce1c67..9e402f8e8bb6b1c76e93b496606de72b96ab0c02 100644 (file)
@@ -355,7 +355,7 @@ public class SmtpManager extends AbstractManager {
                if (events == null)
                        return;
                String to = mcm.getTo() == null ? defaultRecipient : mcm.getTo();
-               String subject = mcm.getSessionName() == null ? defaultSubject : String.format("%s: %s", level, mcm.getSessionName());
+               String subject = mcm.getSessionName() == null ? defaultSubject : String.format("%s: %s #%s", level, mcm.getSessionName(), mcm.getSessionID());
                sendEvents(to, subject, layout, events);
                sessionEvents.remove(sessionID);
        }
index b9feae221f7ecfe1a2edc7e4026139f1e2352592..5ad631a47aff9c544f15f92b534be1a09059fc62 100644 (file)
@@ -9,10 +9,10 @@
                        <parameter name="archiveFtp" type="java.lang.String"/>\r
                        <parameter name="archiveUserName" type="java.lang.String"/>\r
                        <parameter name="archivePassword" type="java.lang.String"/>\r
-                       <parameter name="agencies" type="java.lang.String"/>\r
+                       <parameter name="filterAgencies" type="java.lang.String"/>\r
                        <parameter name="limit" type="java.lang.Integer"/>\r
                        <parameter name="nexioKillDateDays" type="java.lang.Integer"/>\r
-                       <parameter name="nexioAgency" type="java.lang.String"/>\r
+                       <parameter name="targetAgency" type="java.lang.String"/>\r
                </parameters>\r
        </declarations>\r
        <commands>\r
@@ -37,7 +37,7 @@
                                        <parameter name="archivePassword" />\r
                                </input>\r
                                <input>\r
-                                       <parameter name="agencies" />\r
+                                       <parameter name="filterAgencies" />\r
                                </input>\r
                                <input>\r
                                        <parameter name="limit" />\r
@@ -46,7 +46,7 @@
                                        <parameter name="nexioKillDateDays" />\r
                                </input>\r
                                <input>\r
-                                       <parameter name="nexioAgency" />\r
+                                       <parameter name="targetAgency" />\r
                                </input>\r
                        </inputs>\r
                </calljobstep>\r
index d33548680ef3300589825931e3ba3d04fe0d56bf..925290af1a3d39f7ed0a05033680a6c71e614d54 100644 (file)
@@ -6,7 +6,9 @@
                        <parameter name="port" type="java.lang.Integer"/>\r
                        <parameter name="userName" type="java.lang.String"/>\r
                        <parameter name="password" type="java.lang.String"/>\r
+                       <parameter name="filterAgencies" type="java.lang.String"/>\r
                        <parameter name="gracePeriodDays" type="java.lang.Integer"/>\r
+                       <parameter name="notificationOnly" type="java.lang.Boolean"/>\r
                </parameters>\r
        </declarations>\r
        <commands>\r
                                <input>\r
                                        <parameter name="password" />\r
                                </input>\r
+                               <input>\r
+                                       <parameter name="filterAgencies" />\r
+                               </input>\r
                                <input>\r
                                        <parameter name="gracePeriodDays" />\r
                                </input>\r
+                               <input>\r
+                                       <parameter name="notificationOnly" />\r
+                               </input>\r
                        </inputs>\r
                </calljobstep>\r
        </commands>\r
index 7f9cb2c464d7f7664667adb7eed0b79ecb5475f0..31e22db3156061d53b74e03e6c918bd4b7f90aa1 100644 (file)
@@ -30,8 +30,9 @@ public class ArchiveMaterialSubmitStep extends JobStep {
                try {\r
                        for (ArchiveItem archiveItem : archiveList) {\r
                                try {\r
-                                       IJobRuntime submit = jobEngine.submit(JOBTEMPLATE, ARCHIVE, ListUtils.asMap(ARCHIVE_ITEM, archiveItem, GLOBAL_SOURCE_PATH, globalSourcePath,\r
-                                                       TRANSCODER_TARGET_PATH, transcoderTargetPath, WEB_PATH, webPath, KILL_DATE_DAYS, killDateDays));\r
+                                       IJobRuntime runtime = jobEngine.submit(JOBTEMPLATE, ARCHIVE, ListUtils.asMap(ARCHIVE_ITEM, archiveItem, GLOBAL_SOURCE_PATH,\r
+                                                       globalSourcePath, TRANSCODER_TARGET_PATH, transcoderTargetPath, WEB_PATH, webPath, KILL_DATE_DAYS, killDateDays));\r
+\r
                                } catch (Exception e) {\r
                                        if (archiveItem != null)\r
                                                archiveItem.removeCatchedFile();\r
index ad38685fab999f9175f71aef25b591161e21fcb9..5f7eedbb36de8cca9fefb7107dd685f6fe7c4716 100644 (file)
@@ -45,6 +45,7 @@ public class CopyForArchiveNEXIOMaterialsStep extends JobStep {
        private static final String LONGNAMEID = "longnameid";\r
        private static final String ARCHIVEDRUNDOWNS = "archivedrundowns";\r
        private static final String ID = "id";\r
+       private static final String MEDIATYPE = "Octopus bejátszó";\r
        private OctopusAPI octopusAPI;\r
        private IItemManager manager;\r
 \r
@@ -96,16 +97,6 @@ public class CopyForArchiveNEXIOMaterialsStep extends JobStep {
        }\r
 \r
        private BasicDBObject createMetadata(RundownArchive rundownArchive, StoryArchive storyArchive, FileArchive fileArchive) {\r
-               //              {\r
-               //                        "itemHouseId": "43",\r
-               //                        "itemTitle": "Hazahúzó",\r
-               //                        "itemDescription": null,\r
-               //                        "mediaHouseId": "002570",\r
-               //                        "mediaTitle": "2017.12.13",\r
-               //                        "mediaDescription": null,\r
-               //                        "ok": false,\r
-               //                        "userName": "echotest"\r
-               //              }\r
                BasicDBObject result = new BasicDBObject();\r
                result.put("itemHouseId", rundownArchive.getItemHouseId());\r
                result.put("itemTitle", rundownArchive.getItemTitle());\r
@@ -115,6 +106,7 @@ public class CopyForArchiveNEXIOMaterialsStep extends JobStep {
                result.put("mediaHouseId", storyArchive.getMediaHouseId());\r
                result.put("mediaTitle", storyArchive.getMediaTitle());\r
                result.put("mediaDescription", storyArchive.getMediaDesc());\r
+               result.put("mediaType", MEDIATYPE);\r
 \r
                result.put("duration", fileArchive.getDuration());\r
                return result;\r
index 296c84c921f65b4c2cdb3965996f5b5521a787b6..1e58316f3b5fc524cf23e5c549b76bb7a070676b 100644 (file)
@@ -38,7 +38,7 @@ import user.jobengine.server.IJobEngine;
 import user.jobengine.server.IJobRuntime;\r
 \r
 public class CopyForArchiveNEXIORecordingsStep extends JobStep {\r
-       private static final String MEDIATYPE_RECORDING = "Visszarögzített";\r
+       private static final String MEDIATYPE = "Visszarögzített";\r
        private static final String SCHEDULED_FORMAT = "yyyy.MM.dd HH:mm";\r
        private static final String STARTTIME_FORMAT = "HHmm";\r
        private static final Logger logger = LogManager.getLogger();\r
@@ -118,7 +118,7 @@ public class CopyForArchiveNEXIORecordingsStep extends JobStep {
                result.put("mediaDescription", storyArchive.getMediaDesc());\r
 \r
                result.put("duration", fileArchive.getDuration());\r
-               result.put("mediaType", MEDIATYPE_RECORDING);\r
+               result.put("mediaType", MEDIATYPE);\r
                return result;\r
        }\r
 \r
@@ -148,10 +148,10 @@ public class CopyForArchiveNEXIORecordingsStep extends JobStep {
 \r
        @StepEntry\r
        public Object[] execute(int nexioPort, String nexioUserName, String nexioPassword, String archiveFtp, String archiveUserName, String archivePassword,\r
-                       String agencies, int limit, int nexioKillDateDays, String nexioAgency, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
+                       String filterAgencies, int limit, int nexioKillDateDays, String targetAgency, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
                systemMarker = jobRuntime.getMarker();\r
-               setAndCheck(nexioPort, nexioUserName, nexioPassword, archiveFtp, archiveUserName, archivePassword, agencies, limit, nexioKillDateDays, nexioAgency,\r
-                               jobEngine);\r
+               setAndCheck(nexioPort, nexioUserName, nexioPassword, archiveFtp, archiveUserName, archivePassword, filterAgencies, limit, nexioKillDateDays,\r
+                               targetAgency, jobEngine);\r
                octopusAPI = new OctopusAPI();\r
                List<BasicDBObject> clips = queryClips();\r
                processClips(clips, limit);\r
index ac3add9c2f74e04641702888c6420f4c4d4ab635..2318509c97064c8cbfa60c081b1fc858588334bc 100644 (file)
@@ -1,5 +1,6 @@
 package user.jobengine.server.steps;\r
 \r
+import java.text.SimpleDateFormat;\r
 import java.util.Calendar;\r
 import java.util.Date;\r
 import java.util.List;\r
@@ -8,13 +9,13 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
 \r
+import com.ibm.nosql.json.api.BasicDBList;\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
 import com.ibm.nosql.json.api.DBCursor;\r
 import com.ibm.nosql.json.api.QueryBuilder;\r
 \r
-import user.commons.CalendarUtils;\r
 import user.commons.ListUtils;\r
 import user.commons.RemoteFile;\r
 import user.commons.StoreUri;\r
@@ -23,6 +24,7 @@ import user.commons.remotestore.RemoteStoreProtocol;
 import user.jobengine.db.IItemManager;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.JobRuntime;\r
 \r
 public class DeleteNEXIOMaterialsStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r
@@ -31,42 +33,51 @@ public class DeleteNEXIOMaterialsStep extends JobStep {
        private static final String LONGNAMEID = "longnameid";\r
        private static final String EXTAGENCY = "extagency";\r
        private StoreUri sourceUri;\r
+       private JobRuntime jobRuntime;\r
 \r
        private void delete(String name) {\r
                RemoteFile remoteFile = null;\r
                try {\r
                        remoteFile = sourceUri.getRemoteFile(name);\r
-                       if (remoteFile == null)\r
-                               throw new NullPointerException("File not exists: " + name);\r
+                       if (remoteFile == null) {\r
+                               logger.warn(jobRuntime.getMarker(), "A '{}' fájl már nem található a NEXIO szerveren", name);\r
+                               return;\r
+                       }\r
                        sourceUri.delete(remoteFile);\r
-                       logger.info(getMarker(), "A {} fájl törlése sikeres volt.", remoteFile.getName());\r
+                       logger.info(jobRuntime.getMarker(), "A '{}' fájl törlése sikeres volt.", remoteFile.getName());\r
                } catch (Exception e) {\r
-                       logger.error(getMarker(), "A {} fájl nem törölhető. A rendszer hibaüzenete: {}", remoteFile.getName(), e.getMessage());\r
+                       logger.error(jobRuntime.getMarker(), "A '{}' fájl nem törölhető. A rendszer hibaüzenete: {}", remoteFile.getName(), e.getMessage());\r
                }\r
        }\r
 \r
        @StepEntry\r
-       public Object[] execute(int port, String userName, String password, int gracePeriodDays, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
+       public Object[] execute(int port, String userName, String password, String filterAgencies, int gracePeriodDays, boolean notificationOnly,\r
+                       IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
                String nexioHost = System.getProperty("nexio.host");\r
                if (StringUtils.isBlank(nexioHost)) {\r
-                       logger.error(getMarker(), "A 'nexio.host' rendszer paraméter nem található.");\r
-                       throw new NullPointerException("System is not configured properly, 'jobengine.selenio.address' startup parameter missing.");\r
+                       logger.error(jobRuntime.getMarker(), "A 'nexio.host' rendszer paraméter nem található.");\r
+                       throw new NullPointerException("System is not configured properly, 'nexio.host' startup parameter missing.");\r
                }\r
 \r
-               DB db = NoSQLUtils.getNoSQLDB();\r
+               if (StringUtils.isBlank(filterAgencies)) {\r
+                       logger.error(jobRuntime.getMarker(), "A 'nexioAgencies' folyamat paraméter nem található.");\r
+                       throw new NullPointerException("System is not configured properly, 'nexioAgencies' job parameter missing.");\r
+               }\r
 \r
+               DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection collection = db.getCollection(NEXIOCLIPS);\r
                //https://docs.oracle.com/javase/7/docs/api/java/util/regex/Pattern.html\r
                //http://www.vogella.com/tutorials/JavaRegularExpressions/article.html\r
                //              if (StringUtils.isNotBlank(fileNameRegex))\r
                //                      queryBuilder.and(QueryBuilder.start(LONGNAMEID).regex(Pattern.compile(fileNameRegex)).get());\r
-               //              if (StringUtils.isNotBlank(agency))\r
-               //                      queryBuilder.and(QueryBuilder.start(EXTAGENCY).all(agency).get());\r
                Calendar now = Calendar.getInstance();\r
                now.add(Calendar.DAY_OF_YEAR, gracePeriodDays * -1);\r
+               BasicDBList agencies = new BasicDBList((Object[]) filterAgencies.split(","));\r
+\r
+               QueryBuilder dateQueryBuilder = QueryBuilder.start(KILLDATE).lessThan(now.getTime());\r
+               QueryBuilder queryBuilder = QueryBuilder.start(EXTAGENCY).in(agencies).and(dateQueryBuilder.get());\r
+               DBCursor cursor = collection.find(queryBuilder.get()).sort(KILLDATE, -1);\r
 \r
-               QueryBuilder queryBuilder = QueryBuilder.start(KILLDATE).lessThan(now.getTime());\r
-               DBCursor cursor = collection.find(queryBuilder.get());\r
                if (!cursor.hasNext())\r
                        return null;\r
 \r
@@ -77,11 +88,18 @@ public class DeleteNEXIOMaterialsStep extends JobStep {
                sourceUri.setPassword(password);\r
 \r
                List<BasicDBObject> clips = ListUtils.cast(cursor.toArray());\r
+               SimpleDateFormat df = new SimpleDateFormat("yyyy.MM.dd");\r
+\r
+               int i = 0;\r
                for (BasicDBObject clip : clips) {\r
                        String name = String.valueOf(clip.get(LONGNAMEID));\r
                        Date killdate = clip.getDate(KILLDATE);\r
-                       logger.info("{}, {}, {}", name, CalendarUtils.toDateString(CalendarUtils.createCalendar(killdate)), clip.getString(EXTAGENCY));\r
-                       delete(name);\r
+                       if (notificationOnly)\r
+                               logger.info(jobRuntime.getMarker(), "Az {} fájl törölhető. Lejárt: {} ", name, df.format(killdate));\r
+                       //                      else\r
+                       //                              delete(name);\r
+                       i++;\r
+                       setProgress(i * 100 / clips.size());\r
                }\r
 \r
                return null;\r
index 5fb9225cdd06b723c4fad80877b90624f9cafd16..20f6f980bde1b07879f344deffd3564ed272ca90 100644 (file)
@@ -1,31 +1,47 @@
 package user.jobengine.server.steps;\r
 \r
+import java.util.concurrent.CountDownLatch;\r
+\r
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
 \r
+import user.commons.JobStatus;\r
+import user.commons.ListUtils;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.JobStatusChangedEvent;\r
 \r
 public class FakeNoParamsStep extends JobStep {\r
+       private static final String CHILD_TITLE = "Párhuzamosított alfolyamat";\r
+       private static final String CHILD_TEMPLATE = "fake-concurrent.xml";\r
        private static final Logger logger = LogManager.getLogger();\r
        int count = 10;\r
+       CountDownLatch latch = new CountDownLatch(count);\r
+\r
+       private void childStatusChanged(JobStatusChangedEvent event) {\r
+               if (JobStatus.SUSPENDED.equals(event.getStatus()) || JobStatus.FINISHED.equals(event.getStatus()))\r
+                       latch.countDown();\r
+       }\r
 \r
        @StepEntry\r
        public Object[] execute(IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
-               logger.warn(jobRuntime.getMarker(), "Egy WARN {}", "paraméterrel");\r
-               logger.error(jobRuntime.getMarker(), "Egy ERROR {}", "paraméterrel");\r
+               //              logger.warn(jobRuntime.getMarker(), "Egy WARN {}", "paraméterrel");\r
+               //              logger.error(jobRuntime.getMarker(), "Egy ERROR {}", "paraméterrel");\r
+               //              for (int i = 0; i < count; i++) {\r
+               //                      if (!canContinue())\r
+               //                              break;\r
+               //                      jobRuntime.incrementProgress((i + 1) * count);\r
+               //\r
+               //                      Thread.sleep(100);\r
+               //                      logger.info(jobRuntime.getMarker(), "Log markered" + i);\r
+               //\r
+               //                      if (i == 8)\r
+               //                              throw new Exception("stop");\r
+               //              }\r
                for (int i = 0; i < count; i++) {\r
-                       if (!canContinue())\r
-                               break;\r
-                       jobRuntime.incrementProgress((i + 1) * count);\r
-\r
-                       Thread.sleep(100);\r
-                       logger.info(jobRuntime.getMarker(), "Log markered" + i);\r
-\r
-                       if (i == 8)\r
-                               throw new Exception("stop");\r
+                       jobEngine.submit(jobRuntime, e -> childStatusChanged(e), CHILD_TEMPLATE, CHILD_TITLE, ListUtils.asMap("itemID", i));\r
                }\r
+               latch.await();\r
                return null;\r
        }\r
-\r
 }\r
index b259f0d62298ce62097406d4f82b97521c51b80c..60853110b4aca0433aafa0e33762991f4c3b0215 100644 (file)
@@ -13,20 +13,22 @@ public class FakeStep extends JobStep {
 \r
        @StepEntry\r
        public Object[] execute(long itemID, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
-               Object[] result = { 1 };\r
+               Object[] result = { itemID + 1 };\r
+\r
+               logger.info(jobRuntime.getMarker(), "Starting with {}", itemID);\r
                try {\r
                        for (int i = 0; i < count; i++) {\r
                                //sb.append("Sikeres iteráció : ")\r
                                if (!canContinue())\r
                                        break;\r
                                jobRuntime.incrementProgress((i + 1) * count);\r
-                               Thread.sleep(500);\r
+                               Thread.sleep(100);\r
                                //logger.info("Progress {}", jobRuntime.getProgress());\r
                        }\r
                } catch (Exception e) {\r
                        logger.error(e.getMessage());\r
                }\r
-               //logger.info(getMarker(), "Log markered");\r
+               logger.info(jobRuntime.getMarker(), "Resulting {}", result[0]);\r
                return result;\r
        }\r
 \r
index 6a7bf76f2af0c933074ad9c5e4f6395450b0573f..28e7c192bfadcbb2f584d242caf948a9c6395331 100644 (file)
@@ -21,7 +21,7 @@ import user.jobengine.server.IJobRuntime;
 public class MetadataTransformStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r
        private static final String ITEM_MANAGER_IS_NULL = "ItemManager is null";\r
-       public static final String ITEMTYPENAME = "Generic";\r
+       public static final String DEFAULT_MEDIATYPE = "Generic";\r
 \r
        @StepEntry\r
        public Object[] execute(ArchiveItem archiveItem, IJobEngine jobEngine, IJobRuntime jobRuntime) {\r
@@ -34,18 +34,18 @@ public class MetadataTransformStep extends JobStep {
                        jobRuntime.incrementProgress(50);\r
 \r
                        if (mediaCubeItem == null)\r
-                               mediaCubeItem = itemManager.createItem(ITEMTYPENAME, archiveItem.getItemTitle(), archiveItem.getItemDescription(),\r
+                               mediaCubeItem = itemManager.createItem(DEFAULT_MEDIATYPE, archiveItem.getItemTitle(), archiveItem.getItemDescription(),\r
                                                archiveItem.getItemHouseId());\r
 \r
-                       String mediaTypeName = archiveItem.getMediaType();\r
-                       if (StringUtils.isBlank(mediaTypeName)) {\r
-                               mediaCubeMedia = itemManager.createMedia(ITEMTYPENAME, archiveItem.getMediaTitle(), archiveItem.getMediaDescription(),\r
+                       String mediaType = archiveItem.getMediaType();\r
+                       if (StringUtils.isBlank(mediaType)) {\r
+                               mediaCubeMedia = itemManager.createMedia(DEFAULT_MEDIATYPE, archiveItem.getMediaTitle(), archiveItem.getMediaDescription(),\r
                                                archiveItem.getMediaHouseId());\r
                        } else {\r
-                               ItemType itemType = itemManager.getItemType(mediaTypeName);\r
-                               if (itemType == null)\r
-                                       itemManager.createItemType(mediaTypeName, mediaTypeName).add();\r
-                               mediaCubeMedia = itemManager.createMedia(mediaTypeName, archiveItem.getMediaTitle(), archiveItem.getMediaDescription(),\r
+                               ItemType mediaItemType = itemManager.getItemType(mediaType);\r
+                               if (mediaItemType == null)\r
+                                       itemManager.createItemType(mediaType, mediaType).add();\r
+                               mediaCubeMedia = itemManager.createMedia(mediaType, archiveItem.getMediaTitle(), archiveItem.getMediaDescription(),\r
                                                archiveItem.getMediaHouseId());\r
                        }\r
 \r
index b917e498e111d5bf1f3029b5eeb883c72931918c..cfc5de21ba2649702e9110802f60ca0d870eb179 100644 (file)
@@ -106,6 +106,9 @@ public interface IJobEngine {
 
        void startup();
 
+       IJobRuntime submit(IJobRuntime parent, IJobStatusChangedListener statusListener, String template, String name, Map<String, Object> parameters)
+                       throws JobEngineException;
+
        IJobRuntime submit(String template, String name, Map<String, Object> parameters) throws JobEngineException;
 
        void suspendJob(Throwable t, IJobRuntime jobRuntime);
index aaaee4063f57de77e947a1f89b58305b9dddd6b1..7a0f80800b89f4a81e945788ca81a25dde9c5ab7 100644 (file)
@@ -237,6 +237,8 @@ public class JobEngine implements IJobEngine {
        public void addToRunQueue(IJobRuntime jobRuntime) {
                try {
                        logger.debug("{} adding to run queue", jobRuntime);
+                       if (jobRuntime.getIp() == 0 && !jobRuntime.isService() && jobRuntime.getParentJobId() == 0)
+                               logger.info(jobRuntime.getMarker(), "A '{}' folyamat elindult", jobRuntime.getName());
                        runQueue.put(jobRuntime);
                } catch (Exception e) {
                        logger.error(e.getMessage(), e);
@@ -679,7 +681,14 @@ public class JobEngine implements IJobEngine {
                        IJobRuntime jobRuntime = submittedJobs.remove(id);
                        fireJobChangedEvent(new JobChangedEvent(jobRuntime, SignalType.DELETE));
                        logger.info("--- {} removed from VM", jobRuntime);
+                       if (!jobRuntime.isService() && jobRuntime.getParentJobId() == 0) {
+                               if (JobStatus.FINISHED.equals(jobRuntime.getStatus()))
+                                       logger.info(jobRuntime.getFinishMarker(), "A '{}' folyamat futása sikeresen véget ért", jobRuntime.getName());
+                               else
+                                       logger.error(jobRuntime.getFinishMarker(), "A '{}' folyamat futása megszakadt", jobRuntime.getName());
+                       }
                }
+
        }
 
        @Override
@@ -813,6 +822,29 @@ public class JobEngine implements IJobEngine {
                logger.info("+++ {} added to VM ", runtime);
        }
 
+       @Override
+       public IJobRuntime submit(IJobRuntime parent, IJobStatusChangedListener statusListener, String template, String name, Map<String, Object> parameters)
+                       throws JobEngineException {
+               IJobRuntime result = null;
+               IProgram program = getProgram(template);
+               if (program != null) {
+                       isRunnable(program);
+                       result = new JobRuntime(this, program);
+                       result.setPersister(itemManager);
+                       result.setTemplate(template);
+                       result.setName(name);
+                       result.setParameters(parameters);
+                       result.setService(program.getTemplate().isService());
+                       result.setParentJobId(parent.getId());
+                       if (statusListener != null)
+                               result.addEventListener(statusListener);
+                       submit(result);
+               } else {
+                       logger.error("Unknown template: " + template);
+               }
+               return result;
+       }
+
        IJobRuntime submit(IProgram program, IJobStatusChangedListener listener) {
                IJobRuntime jobRuntime = new JobRuntime(this, program);
                jobRuntime.addEventListener(listener);
index bf551c6fff75952ff303bbd9d625f60a1e001f17..1d55710bb93aecfdfcef18b509f12a6bcaa29366 100644 (file)
@@ -131,7 +131,7 @@ public class JobRuntime extends Job implements IJobRuntime {
                children.add(c);
                Message m = logger.getMessageFactory().newMessage("{} {} alfolyamata", this.getId(), this.getName());
                c.setName(m.getFormattedMessage());
-               c.setParentJobId(this.getId());
+               c.setParentJobId(getParentJobId() == 0 ? getId() : getParentJobId());
        }
 
        @Override
@@ -225,7 +225,7 @@ public class JobRuntime extends Job implements IJobRuntime {
        public Marker getMarker() {
                if (sessionMarker == null) {
                        sessionMarker = new MediaCubeMarker();
-                       sessionMarker.setSessionID(String.valueOf(getId()));
+                       sessionMarker.setSessionID(getParentJobId() == 0 ? String.valueOf(getId()) : String.valueOf(getParentJobId()));
                        sessionMarker.setSessionName(name);
                }
                return sessionMarker;
index 121c377c3599a25a1158e7b6e2f73c0e64f1754a..6918b208de1d4fcc094e170f4c6f17a568796a98 100644 (file)
@@ -15,7 +15,5 @@ public class DoneExecutingAction implements IJobStatusAction {
                jobRuntime.setStatus(JobStatus.RUNABLE);\r
                jobRuntime.NotifyUpdate();\r
                jobEngine.addToRunQueue(jobRuntime);\r
-               if (!jobRuntime.isService())\r
-                       logger.info(jobRuntime.getFinishMarker(), "A '{}' folyamat futása sikeresen véget ért", jobRuntime.getName());\r
        }\r
 }\r
index f9fa229b4004712631635940244a74a36bfb43bf..b0f88c6a85cc27ab53ee35f3e0e398d6f456da8b 100644 (file)
@@ -2,16 +2,11 @@ package user.jobengine.server.actions;
 \r
 import java.sql.Timestamp;\r
 \r
-import org.apache.logging.log4j.LogManager;\r
-import org.apache.logging.log4j.Logger;\r
-\r
 import user.commons.JobStatus;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
 \r
 public class DoneSuspendAction implements IJobStatusAction {\r
-       private static final Logger logger = LogManager.getLogger();\r
-\r
        @Override\r
        public void processAction(IJobEngine jobEngine, IJobRuntime jobRuntime) {\r
                jobRuntime.saveStatus();\r
@@ -20,7 +15,5 @@ public class DoneSuspendAction implements IJobStatusAction {
                jobRuntime.NotifyUpdate();\r
                jobRuntime.restoreStack();\r
                jobRuntime.decrementInstructionPointer();\r
-               if (!jobRuntime.isService())\r
-                       logger.error(jobRuntime.getFinishMarker(), "A '{}' folyamat futása megszakadt", jobRuntime.getName());\r
        }\r
 }\r
index 2d6c15d45604ee67c37870b118237780063924cf..d9a9b9faa583b8cd1f1b6695ed2185ea237b0250 100644 (file)
@@ -1,22 +1,15 @@
 package user.jobengine.server.actions;\r
 \r
-import org.apache.logging.log4j.LogManager;\r
-import org.apache.logging.log4j.Logger;\r
-\r
 import user.commons.JobStatus;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
 \r
 public class ExecuteRunableAction implements IJobStatusAction {\r
-       private static final Logger logger = LogManager.getLogger();\r
-\r
        @Override\r
        public void processAction(IJobEngine jobEngine, IJobRuntime jobRuntime) {\r
                jobRuntime.setStatus(JobStatus.WAIT_EXECUTOR);\r
                jobRuntime.NotifyUpdate();\r
                jobRuntime.saveStack();\r
                jobEngine.addToExecutorQueue(jobRuntime);\r
-               if (!jobRuntime.isService())\r
-                       logger.info(jobRuntime.getMarker(), "A '{}' folyamat elindult", jobRuntime.getName());\r
        }\r
 }\r
index a030bcdddb23a5a340656d684923d3d03cef00bc..698e7af36a2cec37275c936c3dfeb500f9edcb72 100644 (file)
@@ -30,7 +30,7 @@ public class StatusMachine implements IStatusMachine {
                StatusMachineAction machineAction = new StatusMachineAction(jobAction, jobRuntime.getStatus());\r
                if (actions.containsKey(machineAction)) {\r
                        IJobStatusAction action = actions.get(machineAction);\r
-                       logger.debug("{} status change {} -> {}", jobRuntime, jobRuntime.getStatus(), jobAction);\r
+                       logger.info("{} status change {} -> {}", jobRuntime, jobRuntime.getStatus(), jobAction);\r
                        action.processAction(jobEngine, jobRuntime);\r
                }\r
 \r