From: Vásáry Dániel Date: Tue, 5 Feb 2019 10:15:50 +0000 (+0000) Subject: #132 NEXIO AGENCY, KILLDATE visszaírás instabil X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=b0e9052cafe17df180eb929512923964463fcb97;p=mediacube.git #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 000156f8..446a12c3 100644 --- a/client/Maestro/Configuration/configuration - Copy.json +++ b/client/Maestro/Configuration/configuration - Copy.json @@ -1,6 +1,6 @@ { "title": "Development", - "active": false, + "active": true, "startInTray": false, "enableCustomMetadataId": true, "filter": "avi", @@ -61,6 +61,22 @@ "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", "timeout": 1000 } + }, + { + "label": "CLEAN Archiválás", + "processor": "FXPTargetProcessor", + "outputFormat": "%ID%-%SOURCENAME%", + "sourceNexioAgency": "ARCHIVED2", + "sourceNexioKillDateDays": 5, + "tag": "Archiválás", + "saveArchiveMetadata": true, + "remote": { + "address": "ftp://10.10.1.105/TESZT/", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + } } + ] } diff --git a/client/Maestro/Configuration/configuration.json b/client/Maestro/Configuration/configuration.json index 322f07ec..35dc95d8 100644 --- a/client/Maestro/Configuration/configuration.json +++ b/client/Maestro/Configuration/configuration.json @@ -1,6 +1,6 @@ { "title": "Development", - "active": true, + "active": false, "startInTray": false, "enableCustomMetadataId": true, "filter": "avi", diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs index 0377c08c..3e843589 100644 --- a/client/Maestro/MaestroForm.cs +++ b/client/Maestro/MaestroForm.cs @@ -178,34 +178,40 @@ namespace Maestro { private void ProcessorWorker_DoWork(object sender, DoWorkEventArgs e) { while (!e.Cancel) { - if (jobsQueue.TryDequeue(out ITargetProcessor job)) { - (this).SafeCall(() => { - int position = jobs.IndexOf(job); - if (position == -1) - return; - if (chkAutoScroll.Checked) { - bindingSourceJobs.Position = position; - dgJobs.FirstDisplayedScrollingRowIndex = position; - } - }); - if (TargetProcessor.REVOKED.Equals(job.Status)) - continue; - if (TargetProcessor.SKIPPED.Equals(job.Status)) - continue; - (this).SafeCall(() => { - lRunningCount.Text = "1"; - }); - job.Execute(); - (this).SafeCall(() => { - UpdateJobCounts(); - lRunningCount.Text = "0"; - }); - } else { - (this).SafeCall(() => { - lRunningCount.Text = "0"; - }); - Thread.Sleep(100); + + try { + if (jobsQueue.TryDequeue(out ITargetProcessor job)) { + (this).SafeCall(() => { + int position = jobs.IndexOf(job); + if (position == -1) + return; + if (chkAutoScroll.Checked) { + bindingSourceJobs.Position = position; + dgJobs.FirstDisplayedScrollingRowIndex = position; + } + }); + if (TargetProcessor.REVOKED.Equals(job.Status)) + continue; + if (TargetProcessor.SKIPPED.Equals(job.Status)) + continue; + (this).SafeCall(() => { + lRunningCount.Text = "1"; + }); + job.Execute(); + (this).SafeCall(() => { + UpdateJobCounts(); + lRunningCount.Text = "0"; + }); + } else { + (this).SafeCall(() => { + lRunningCount.Text = "0"; + }); + Thread.Sleep(100); + } + } catch (Exception ex) { + logger.Error(ex); } + } } diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs index 2b9337d2..d57fd576 100644 --- 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 // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.9.3")] -[assembly: AssemblyFileVersion("2.0.9.3")] +[assembly: AssemblyVersion("2.0.9.4")] +[assembly: AssemblyFileVersion("2.0.9.4")] diff --git a/client/MaestroShared/Properties/AssemblyInfo.cs b/client/MaestroShared/Properties/AssemblyInfo.cs index 9c8a8f18..c592cd27 100644 --- 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 // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.9.4")] -[assembly: AssemblyFileVersion("2.0.9.4")] +[assembly: AssemblyVersion("2.0.9.5")] +[assembly: AssemblyFileVersion("2.0.9.5")] diff --git a/client/MaestroShared/Targets/FXPTargetProcessor.cs b/client/MaestroShared/Targets/FXPTargetProcessor.cs index f390bc0c..d17f0a41 100644 --- a/client/MaestroShared/Targets/FXPTargetProcessor.cs +++ b/client/MaestroShared/Targets/FXPTargetProcessor.cs @@ -119,8 +119,11 @@ namespace MaestroShared.Targets { Thread.Sleep(500); } - var reply = targetFTP.GetReply(); - //logger.Info("Reply is {0}", reply.Message); + var sreply = sourceFTP.GetReply(); + logger.Info("Source last reply is {0}", sreply.Message); + + var treply = targetFTP.GetReply(); + logger.Info("Target last reply is {0}", treply.Message); if (useTemporaryName) { if (!targetFTP.MoveFile(targetFilePath, OutputName)) @@ -175,6 +178,7 @@ namespace MaestroShared.Targets { xml = NexioXML.ToXML(name, date, null, Parameters.TargetConfig.SourceNexioAgency); } else xml = NexioXML.ToXML(name, null, null, Parameters.TargetConfig.SourceNexioAgency); + logger.Trace($"Uploading metadata xml\r\n {xml}"); byte[] content = Encoding.Unicode.GetBytes(xml); UploadContentToSource(name + XML_EXT, content); logger.Trace(Strings.EXIT);