Skip to content

Commit

Permalink
switch transfers to workers
Browse files Browse the repository at this point in the history
  • Loading branch information
davidejones authored and bep committed Mar 7, 2023
1 parent e6f029b commit bebb2b8
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions commands/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand All @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion commands/hugo.go
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,9 @@ func initializeFlags(cmd *cobra.Command, cfg config.Provider) {
"target",
"theme",
"themesDir",
"transfers",
"verbose",
"verboseLog",
"workers",
"duplicateTargetPaths",
}

Expand Down
6 changes: 3 additions & 3 deletions deploy/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/content/en/commands/hugo_deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bebb2b8

Please sign in to comment.