switch transfers to workers

diff --git a/commands/deploy.go b/commands/deploy.go
index 3a717201ecac282e3ba3283e51ab08833d6ba7d7..295940c2e34e712b63889a45774d6d39d314a83f 100644 (file)
--- a/commands/deploy.go
+++ b/commands/deploy.go
@@ -31,7 +31,7 @@ type deployCmd struct {
 
        invalidateCDN bool
        maxDeletes    int
-       transfers     int
+       workers       int
 }
 
 // TODO: In addition to the "deploy" command, consider adding a "--deploy"
@@ -60,7 +60,7 @@ documentation.
                        cfgInit := func(c *commandeer) error {
                                c.Set("invalidateCDN", cc.invalidateCDN)
                                c.Set("maxDeletes", cc.maxDeletes)
-                               c.Set("transfers", cc.transfers)
+                               c.Set("workers", cc.workers)
                                return nil
                        }
                        comm, err := initializeConfig(true, true, false, &cc.hugoBuilderCommon, cc, cfgInit)
@@ -81,7 +81,7 @@ documentation.
        cmd.Flags().Bool("force", false, "force upload of all files")
        cmd.Flags().BoolVar(&cc.invalidateCDN, "invalidateCDN", true, "invalidate the CDN cache listed in the deployment target")
        cmd.Flags().IntVar(&cc.maxDeletes, "maxDeletes", 256, "maximum # of files to delete, or -1 to disable")
-       cmd.Flags().IntVar(&cc.transfers, "transfers", 10, "number of file transfers to run in parallel. defaults to 10")
+       cmd.Flags().IntVar(&cc.workers, "workers", 10, "number of workers to transfer files. defaults to 10")
 
        cc.baseBuilderCmd = b.newBuilderBasicCmd(cmd)
 

diff --git a/commands/hugo.go b/commands/hugo.go
index 156aa35b9241e1b423bdfdaa59e7594551f4df59..12575618beabdb2bd8a3adbf512fa3b7c6b06711 100644 (file)
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -236,9 +236,9 @@ func initializeFlags(cmd *cobra.Command, cfg config.Provider) {
                "target",
                "theme",
                "themesDir",
-               "transfers",
                "verbose",
                "verboseLog",
+               "workers",
                "duplicateTargetPaths",
        }
 

diff --git a/deploy/deploy.go b/deploy/deploy.go
index e2a12ca7f07f0b517d5604e86bbd36a1d6197239..edc94c4041eccca0d201b53fd1b0da385a364a9c 100644 (file)
--- a/deploy/deploy.go
+++ b/deploy/deploy.go
@@ -65,7 +65,7 @@ type Deployer struct {
        force         bool             // true forces upload of all files
        invalidateCDN bool             // true enables invalidate CDN cache (if possible)
        maxDeletes    int              // caps the # of files to delete; -1 to disable
-       transfers     int              // The number of file transfers to run in parallel
+       workers       int              // The number of workers to transfer files
 
        // For tests...
        summary deploySummary // summary of latest Deploy results
@@ -119,7 +119,7 @@ func New(cfg config.Provider, localFs afero.Fs) (*Deployer, error) {
                force:         cfg.GetBool("force"),
                invalidateCDN: cfg.GetBool("invalidateCDN"),
                maxDeletes:    cfg.GetInt("maxDeletes"),
-               transfers:     cfg.GetInt("transfers"),
+               workers:       cfg.GetInt("workers"),
        }, nil
 }
 
@@ -191,7 +191,7 @@ func (d *Deployer) Deploy(ctx context.Context) error {
        // Apply the changes in parallel, using an inverted worker
        // pool (https://www.youtube.com/watch?v=5zXAHh5tJqQ&t=26m58s).
        // sem prevents more than nParallel concurrent goroutines.
-       nParallel := d.transfers
+       nParallel := d.workers
        var errs []error
        var errMu sync.Mutex // protects errs
 

diff --git a/docs/content/en/commands/hugo_deploy.md b/docs/content/en/commands/hugo_deploy.md
index c3cb9f68dd7015d6907347dcee3048323c3a38c3..7b14c30ef4bce1531e04566b3bbb28b95b262cfc 100644 (file)
--- a/docs/content/en/commands/hugo_deploy.md
+++ b/docs/content/en/commands/hugo_deploy.md
@@ -31,7 +31,7 @@ hugo deploy [flags]
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --invalidateCDN              invalidate the CDN cache listed in the deployment target (default true)
       --maxDeletes int             maximum # of files to delete, or -1 to disable (default 256)
-      --transfers int              number of file transfers to run in parallel (default 10)
+      --workers int                number of workers to transfer files. (default 10)
   -s, --source string              filesystem path to read files relative from
       --target string              target deployment from deployments section in config file; defaults to the first one
       --themesDir string           filesystem path to themes directory