fix-bug-and-remove-hardcoded-source-and-disconnect-before-reconnecting

YouweGit · Aug 29, 2019 · 3bfade2 · 3bfade2
1 parent ee51b79
commit 3bfade2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/Command/TransferFileCommand.php b/Command/TransferFileCommand.php
@@ -57,8 +57,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $service->setMode($input->getOption('method'));
 
         if ($service->getMode() === FileTransferService::MODE_GET) {
-            $files = $service->getRemoteFiles($targetserverid, '/PROD', $this->input->getOption('ignore', []));
-            
+            $files = $service->getRemoteFiles($targetserverid, $sourcefile, $this->input->getOption('ignore', []));
+
             if (is_array($files)) {
                 foreach ($files as $file) {
                     $service->transferFile(
@@ -67,12 +67,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
                         $targetfile . $file);
                 }
             }
-        }
-
-        if ($this->useDirectoryMode($sourcefile)) {
-            $this->transferDirectory($service, $targetserverid, $sourcefile, $targetfile);
+
         } else {
-            $service->transferFile($targetserverid, $sourcefile, $targetfile);
+
+            if ($this->useDirectoryMode($sourcefile)) {
+                $this->transferDirectory($service, $targetserverid, $sourcefile, $targetfile);
+            } else {
+                $service->transferFile($targetserverid, $sourcefile, $targetfile);
+            }
+
         }
     }
 

diff --git a/Service/FileTransferService.php b/Service/FileTransferService.php
@@ -95,6 +95,9 @@ public function transferFile($serverid, $sourcefile, $targetfile)
                 throw new \RuntimeException("There is no mode selected please use -m or --method");
                 break;
         }
+
+        $sftp->disconnect();
+
     }
 
     /**
@@ -111,7 +114,7 @@ private function loginInSftp(string $serverid)
             $e = "Sftp login failed for user " . $username;
             $this->logger->error($e);
             throw new \RuntimeException($e);
-        }
+        } 
 
         return $sftp;
     }