0
0
mirror of https://github.com/thegeeklab/wp-s3-action.git synced 2024-11-10 04:40:38 +00:00

using int instead of string

This commit is contained in:
stephensxu 2018-08-15 11:13:06 -07:00
parent c0496f588c
commit 364ee8f5db
2 changed files with 5 additions and 12 deletions

View File

@ -116,10 +116,10 @@ func main() {
Name: "env-file", Name: "env-file",
Usage: "source env file", Usage: "source env file",
}, },
cli.StringFlag{ cli.IntFlag{
Name: "max-concurrency", Name: "max-concurrency",
Usage: "customize number concurrent files to process", Usage: "customize number concurrent files to process",
Value: "100", Value: 100,
EnvVar: "PLUGIN_MAX_CONCURRENCY", EnvVar: "PLUGIN_MAX_CONCURRENCY",
}, },
@ -152,7 +152,7 @@ func run(c *cli.Context) error {
Redirects: c.Generic("redirects").(*MapFlag).Get(), Redirects: c.Generic("redirects").(*MapFlag).Get(),
CloudFrontDistribution: c.String("cloudfront-distribution"), CloudFrontDistribution: c.String("cloudfront-distribution"),
DryRun: c.Bool("dry-run"), DryRun: c.Bool("dry-run"),
MaxConcurrency: c.String("max-concurrency"), MaxConcurrency: c.Int("max-concurrency"),
} }
return plugin.Exec() return plugin.Exec()

View File

@ -6,7 +6,6 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
"strconv"
) )
type Plugin struct { type Plugin struct {
@ -29,7 +28,7 @@ type Plugin struct {
PathStyle bool PathStyle bool
client AWS client AWS
jobs []job jobs []job
MaxConcurrency string MaxConcurrency int
} }
type job struct { type job struct {
@ -156,13 +155,7 @@ func (p *Plugin) createInvalidateJob() {
func (p *Plugin) runJobs() { func (p *Plugin) runJobs() {
client := p.client client := p.client
maxConcurrency, err := strconv.Atoi(p.MaxConcurrency) jobChan := make(chan struct{}, p.MaxConcurrency)
if err != nil {
fmt.Printf("ERROR: invalid input for max-concurrency")
os.Exit(1)
}
jobChan := make(chan struct{}, maxConcurrency)
results := make(chan *result, len(p.jobs)) results := make(chan *result, len(p.jobs))
var invalidateJob *job var invalidateJob *job