Show the proper local and remote destination of deployed files

plesk · Jun 20, 2021 · a55d4ae · a55d4ae
1 parent 3ec9bb2
commit a55d4ae
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/internal/locales/locales.go b/internal/locales/locales.go
@@ -117,7 +117,7 @@ func init() {
 			"errors.stor.failed":               "Could not store file %s over FTP: %s",
 
 			"debug.mkdir.success": "Successfully created directory %s on server",
-			"debug.stor.success":  "Successfully stored file %s on server",
+			"debug.stor.success":  "Successfully stored local file %s to <remote>:%s",
 			"debug.cwd":           "Changing directory to %s",
 			"debug.dir.skip":      "Skipping directory %s that exists on target",
 			"debug.file.skip":     "Skipping file %s that exists on target (no overwrite specified)",

diff --git a/internal/upload/ftp.go b/internal/upload/ftp.go
@@ -5,6 +5,7 @@ package upload
 import (
 	"crypto/tls"
 	"os"
+	"path/filepath"
 	"strings"
 	"sync"
 	"time"
@@ -134,15 +135,18 @@ func (c *ftpConnection) UploadFile(
 		return err
 	}
 
+	localFileName := filepath.Join(".", fileName)
+	remoteFileName := filepath.Join(serverRoot, basePath, baseName)
+
 	entry, err := c.findFile(serverRoot+basePath, baseName)
 	if entry != nil && err == nil {
 		if file.IsDir() && entry.Type == ftp.EntryTypeFolder {
-			utils.Log.Debug(locales.L.Get("debug.dir.skip", fileName))
+			utils.Log.Debug(locales.L.Get("debug.dir.skip", localFileName))
 			return nil
 		}
 
 		if !file.IsDir() && entry.Type == ftp.EntryTypeFile && !overwrite {
-			utils.Log.Debug(locales.L.Get("debug.file.skip", fileName))
+			utils.Log.Debug(locales.L.Get("debug.file.skip", localFileName))
 			return nil
 		}
 	}
@@ -151,9 +155,9 @@ func (c *ftpConnection) UploadFile(
 		err = c.inner.MakeDir(baseName)
 
 		if err != nil {
-			utils.Log.Error(locales.L.Get("errors.mkdir.failed", clientRoot+baseName, err.Error()))
+			utils.Log.Error(locales.L.Get("errors.mkdir.failed", localFileName, err.Error()))
 		} else {
-			utils.Log.Debug(locales.L.Get("debug.mkdir.success", clientRoot+baseName))
+			utils.Log.Debug(locales.L.Get("debug.mkdir.success", localFileName))
 		}
 	} else {
 		file, err := os.Open(clientRoot + basePath + baseName)
@@ -163,9 +167,9 @@ func (c *ftpConnection) UploadFile(
 		err = c.inner.Stor(baseName, file)
 
 		if err != nil {
-			utils.Log.Error(locales.L.Get("errors.stor.failed", clientRoot+baseName, err.Error()))
+			utils.Log.Error(locales.L.Get("errors.stor.failed", localFileName, err.Error()))
 		} else {
-			utils.Log.Print(locales.L.Get("debug.stor.success", clientRoot+baseName))
+			utils.Log.Print(locales.L.Get("debug.stor.success", localFileName, remoteFileName))
 		}
 	}