Nagy file FXP ateneti nev hasznalataval hibat dob

diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs
index ebd037d083832ecf0d4f6a0c42a7561339960969..94f2a3ed2af690d952d9dca00233df61f316d2fe 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.1.1.8")]\r
-[assembly: AssemblyFileVersion("2.1.1.8")]\r
+[assembly: AssemblyVersion("2.1.1.9")]\r
+[assembly: AssemblyFileVersion("2.1.1.9")]\r

diff --git a/client/MaestroShared/Properties/AssemblyInfo.cs b/client/MaestroShared/Properties/AssemblyInfo.cs
index 5da145e3cddc6d56491f4c0987c82f0e2934e6da..5ad59bc4a2f317b32ca85f31b3ba2ac7c0e3d98f 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.1.1.1")]\r
-[assembly: AssemblyFileVersion("2.1.1.1")]\r
+[assembly: AssemblyVersion("2.1.1.2")]\r
+[assembly: AssemblyFileVersion("2.1.1.2")]\r

diff --git a/client/MaestroShared/Targets/FTPTargetProcessor.cs b/client/MaestroShared/Targets/FTPTargetProcessor.cs
index 3949546da951a4311c36f39135137ba03cd2278e..895641c8821ff9201361e6b856e1b8f6479bbd8a 100644 (file)
--- a/client/MaestroShared/Targets/FTPTargetProcessor.cs
+++ b/client/MaestroShared/Targets/FTPTargetProcessor.cs
@@ -175,7 +175,7 @@ namespace MaestroShared.Targets {
                 InternetProtocolVersions = FtpIpVersion.IPv4,\r
                 UploadDataType = FtpDataType.Binary,\r
                 DownloadDataType = FtpDataType.Binary,\r
-                Credentials = new NetworkCredential(connection.UserName, connection.Password),\r
+                Credentials = new NetworkCredential(connection.UserName, connection.Password)\r
             };\r
             result.Connect();\r
             return result;\r

diff --git a/client/MaestroShared/Targets/FXPTargetProcessor.cs b/client/MaestroShared/Targets/FXPTargetProcessor.cs
index d17f0a413a0f1f61bfe92132b73869a60a6a5d51..76d12094980785db31bccb447c7c3530a0bf2dec 100644 (file)
--- a/client/MaestroShared/Targets/FXPTargetProcessor.cs
+++ b/client/MaestroShared/Targets/FXPTargetProcessor.cs
@@ -83,7 +83,7 @@ namespace MaestroShared.Targets {
                 targetFTP.Command("TYPE I");\r
 \r
                 string currentWorkingDir = targetFTP.GetWorkingDirectory();\r
-                logger.Debug("Current target working directory is {0}", currentWorkingDir);\r
+                logger.Info("Current target working directory is {0}", currentWorkingDir);\r
 \r
                 string targetFilePath = OutputName;\r
                 bool useTemporaryName = !targetFTP.IsNexio() && Parameters.TargetConfig.TemporaryCopy;\r
@@ -119,15 +119,43 @@ namespace MaestroShared.Targets {
                     Thread.Sleep(500);\r
                 }\r
 \r
+                logger.Info("Upload completed for {0}", Input);\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
+                try\r
+                {\r
+                    Thread.Sleep(500);\r
+                    var treply = targetFTP.GetReply();\r
+                    logger.Info("Target last reply is {0}", treply.Message);\r
+                }\r
+                catch (Exception e1){\r
+                    logger.Warn("Can't query target.");\r
+                }\r
 \r
                 if (useTemporaryName) {\r
+                    logger.Info("Temporary target used, rename required. From {0}, to {1}, in {2}", targetFilePath, OutputName, currentWorkingDir);\r
+\r
+                    try\r
+                    {\r
+                        targetFTP.Disconnect();\r
+                    }\r
+                    catch (Exception e)\r
+                    {\r
+                        logger.Error(e.Message);\r
+                    }\r
+                    try\r
+                    {\r
+                        targetFTP = CreateClient(Parameters.TargetConfig.Remote);\r
+                        targetFTP.SetWorkingDirectory(currentWorkingDir);\r
+                    }\r
+                    catch (Exception e)\r
+                    {\r
+                        logger.Error(e.Message);\r
+                    }\r
+\r
                     if (!targetFTP.MoveFile(targetFilePath, OutputName))\r
-                        throw new Exception(UPLOAD_ERROR);\r
+                        throw new Exception("A fájl átnevezése a célrendszerben sikertelen!");\r
                 }\r
             } catch (Exception e) {\r
                 throw e;\r