#132 NEXIO AGENCY, KILLDATE visszaírás instabil

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

diff --git a/client/Maestro/Configuration/configuration - Copy.json b/client/Maestro/Configuration/configuration - Copy.json
index 000156f883cd32a315662c3995b425fc4811189e..446a12c34dd6bc8e7868f1d4b6bf5b63bb4cd52e 100644 (file)
--- a/client/Maestro/Configuration/configuration - Copy.json
+++ b/client/Maestro/Configuration/configuration - Copy.json
@@ -1,6 +1,6 @@
 {\r
   "title": "Development",\r
-  "active": false,\r
+  "active": true,\r
   "startInTray": false,\r
   "enableCustomMetadataId": true,\r
   "filter": "avi",\r
@@ -61,6 +61,22 @@
         "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
         "timeout": 1000\r
       }\r
+    },\r
+    {\r
+      "label": "CLEAN Archiválás",\r
+      "processor": "FXPTargetProcessor",\r
+      "outputFormat": "%ID%-%SOURCENAME%",\r
+      "sourceNexioAgency": "ARCHIVED2",\r
+      "sourceNexioKillDateDays": 5,\r
+      "tag": "Archiválás",\r
+      "saveArchiveMetadata": true,\r
+      "remote": {\r
+        "address": "ftp://10.10.1.105/TESZT/",\r
+        "userName": "mediacube",\r
+        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+        "timeout": 1000\r
+      }\r
     }\r
+\r
   ]\r
 }\r

diff --git a/client/Maestro/Configuration/configuration.json b/client/Maestro/Configuration/configuration.json
index 322f07ec84a9dfa739082ae2ffebf18d83d24fd8..35dc95d8f860b5f214ec84bb87424ce91274aeab 100644 (file)
--- a/client/Maestro/Configuration/configuration.json
+++ b/client/Maestro/Configuration/configuration.json
@@ -1,6 +1,6 @@
 {\r
   "title": "Development",\r
-  "active": true,\r
+  "active": false,\r
   "startInTray": false,\r
   "enableCustomMetadataId": true,\r
   "filter": "avi",\r

diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs
index 0377c08c730e0b3cec48ca0db61ed837bf6636e4..3e843589c11894f3f219f25b7684673ed0fea751 100644 (file)
--- a/client/Maestro/MaestroForm.cs
+++ b/client/Maestro/MaestroForm.cs
@@ -178,34 +178,40 @@ namespace Maestro {
 \r
         private void ProcessorWorker_DoWork(object sender, DoWorkEventArgs e) {\r
             while (!e.Cancel) {\r
-                if (jobsQueue.TryDequeue(out ITargetProcessor job)) {\r
-                    (this).SafeCall(() => {\r
-                        int position = jobs.IndexOf(job);\r
-                        if (position == -1)\r
-                            return;\r
-                        if (chkAutoScroll.Checked) {\r
-                            bindingSourceJobs.Position = position;\r
-                            dgJobs.FirstDisplayedScrollingRowIndex = position;\r
-                        }\r
-                    });\r
-                    if (TargetProcessor.REVOKED.Equals(job.Status))\r
-                        continue;\r
-                    if (TargetProcessor.SKIPPED.Equals(job.Status))\r
-                        continue;\r
-                    (this).SafeCall(() => {\r
-                        lRunningCount.Text = "1";\r
-                    });\r
-                    job.Execute();\r
-                    (this).SafeCall(() => {\r
-                        UpdateJobCounts();\r
-                        lRunningCount.Text = "0";\r
-                    });\r
-                } else {\r
-                    (this).SafeCall(() => {\r
-                        lRunningCount.Text = "0";\r
-                    });\r
-                    Thread.Sleep(100);\r
+\r
+                try {\r
+                    if (jobsQueue.TryDequeue(out ITargetProcessor job)) {\r
+                        (this).SafeCall(() => {\r
+                            int position = jobs.IndexOf(job);\r
+                            if (position == -1)\r
+                                return;\r
+                            if (chkAutoScroll.Checked) {\r
+                                bindingSourceJobs.Position = position;\r
+                                dgJobs.FirstDisplayedScrollingRowIndex = position;\r
+                            }\r
+                        });\r
+                        if (TargetProcessor.REVOKED.Equals(job.Status))\r
+                            continue;\r
+                        if (TargetProcessor.SKIPPED.Equals(job.Status))\r
+                            continue;\r
+                        (this).SafeCall(() => {\r
+                            lRunningCount.Text = "1";\r
+                        });\r
+                        job.Execute();\r
+                        (this).SafeCall(() => {\r
+                            UpdateJobCounts();\r
+                            lRunningCount.Text = "0";\r
+                        });\r
+                    } else {\r
+                        (this).SafeCall(() => {\r
+                            lRunningCount.Text = "0";\r
+                        });\r
+                        Thread.Sleep(100);\r
+                    }\r
+                } catch (Exception ex) {\r
+                    logger.Error(ex);\r
                 }\r
+\r
             }\r
         }\r
 \r

diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs
index 2b9337d2fefa86d32c1fe0f597510a2fbf0db470..d57fd57694c5e538288d24375d1f0e9e204abb44 100644 (file)
--- a/client/Maestro/Properties/AssemblyInfo.cs
+++ b/client/Maestro/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers\r
 // by using the '*' as shown below:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("2.0.9.3")]\r
-[assembly: AssemblyFileVersion("2.0.9.3")]\r
+[assembly: AssemblyVersion("2.0.9.4")]\r
+[assembly: AssemblyFileVersion("2.0.9.4")]\r

diff --git a/client/MaestroShared/Properties/AssemblyInfo.cs b/client/MaestroShared/Properties/AssemblyInfo.cs
index 9c8a8f1818b832d8ff3e2607f1fa211c275e986d..c592cd270a929ec98fd44df326737385bf238932 100644 (file)
--- a/client/MaestroShared/Properties/AssemblyInfo.cs
+++ b/client/MaestroShared/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers\r
 // by using the '*' as shown below:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("2.0.9.4")]\r
-[assembly: AssemblyFileVersion("2.0.9.4")]\r
+[assembly: AssemblyVersion("2.0.9.5")]\r
+[assembly: AssemblyFileVersion("2.0.9.5")]\r

diff --git a/client/MaestroShared/Targets/FXPTargetProcessor.cs b/client/MaestroShared/Targets/FXPTargetProcessor.cs
index f390bc0c0a195c24173167f104e412249ac326ab..d17f0a413a0f1f61bfe92132b73869a60a6a5d51 100644 (file)
--- a/client/MaestroShared/Targets/FXPTargetProcessor.cs
+++ b/client/MaestroShared/Targets/FXPTargetProcessor.cs
@@ -119,8 +119,11 @@ namespace MaestroShared.Targets {
                     Thread.Sleep(500);\r
                 }\r
 \r
-                var reply = targetFTP.GetReply();\r
-                //logger.Info("Reply is {0}", reply.Message);\r
+                var sreply = sourceFTP.GetReply();\r
+                logger.Info("Source last reply is {0}", sreply.Message);\r
+\r
+                var treply = targetFTP.GetReply();\r
+                logger.Info("Target last reply is {0}", treply.Message);\r
 \r
                 if (useTemporaryName) {\r
                     if (!targetFTP.MoveFile(targetFilePath, OutputName))\r
@@ -175,6 +178,7 @@ namespace MaestroShared.Targets {
                 xml = NexioXML.ToXML(name, date, null, Parameters.TargetConfig.SourceNexioAgency);\r
             } else\r
                 xml = NexioXML.ToXML(name, null, null, Parameters.TargetConfig.SourceNexioAgency);\r
+            logger.Trace($"Uploading metadata xml\r\n {xml}");\r
             byte[] content = Encoding.Unicode.GetBytes(xml);\r
             UploadContentToSource(name + XML_EXT, content);\r
             logger.Trace(Strings.EXIT);\r