Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmd/swarm: add flag for application name (swarm or swarm-private) #18189

Merged
merged 4 commits into from
Nov 29, 2018
Merged

cmd/swarm: add flag for application name (swarm or swarm-private) #18189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f76f000
cmd/swarm: add flag for application name (swarm or swarm-private)
nonsense Nov 27, 2018
8633cbe
cmd/swarm/swarm-smoke: return correct exit code
nonsense Nov 28, 2018
1fec471
cmd/swarm/swarm-smoke: remove colorable
nonsense Nov 28, 2018
d965c70
remove swarm/grafana_dashboards
nonsense Nov 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/swarm/swarm-smoke/feed_upload_and_sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func cliFeedUploadAndSync(c *cli.Context) error {

defer func(now time.Time) { log.Info("total time", "time", time.Since(now), "size (kb)", filesize) }(time.Now())

generateEndpoints(scheme, cluster, from, to)
generateEndpoints(scheme, cluster, appName, from, to)

log.Info("generating and uploading feeds to " + endpoints[0] + " and syncing")

Expand Down
8 changes: 8 additions & 0 deletions cmd/swarm/swarm-smoke/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ var (
endpoints []string
includeLocalhost bool
cluster string
appName string
scheme string
filesize int
from int
Expand All @@ -49,6 +50,12 @@ func main() {
Usage: "cluster to point to (prod or a given namespace)",
Destination: &cluster,
},
cli.StringFlag{
Name: "app",
Value: "swarm",
Usage: "application to point to (swarm or swarm-private)",
Destination: &appName,
},
cli.IntFlag{
Name: "cluster-from",
Value: 8501,
Expand Down Expand Up @@ -107,5 +114,6 @@ func main() {
err := app.Run(os.Args)
if err != nil {
log.Error(err.Error())
os.Exit(1)
}
}
11 changes: 5 additions & 6 deletions cmd/swarm/swarm-smoke/upload_and_sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,19 @@ import (
"time"

"github.com/ethereum/go-ethereum/log"
colorable "github.com/mattn/go-colorable"
"github.com/pborman/uuid"

cli "gopkg.in/urfave/cli.v1"
)

func generateEndpoints(scheme string, cluster string, from int, to int) {
func generateEndpoints(scheme string, cluster string, app string, from int, to int) {
if cluster == "prod" {
for port := from; port <= to; port++ {
endpoints = append(endpoints, fmt.Sprintf("%s://%v.swarm-gateways.net", scheme, port))
}
} else {
for port := from; port <= to; port++ {
endpoints = append(endpoints, fmt.Sprintf("%s://swarm-%v-%s.stg.swarm-gateways.net", scheme, port, cluster))
endpoints = append(endpoints, fmt.Sprintf("%s://%s-%v-%s.stg.swarm-gateways.net", scheme, app, port, cluster))
}
}

Expand All @@ -57,11 +56,11 @@ func generateEndpoints(scheme string, cluster string, from int, to int) {

func cliUploadAndSync(c *cli.Context) error {
log.PrintOrigins(true)
log.Root().SetHandler(log.LvlFilterHandler(log.Lvl(verbosity), log.StreamHandler(colorable.NewColorableStderr(), log.TerminalFormat(true))))
log.Root().SetHandler(log.LvlFilterHandler(log.Lvl(verbosity), log.StreamHandler(os.Stdout, log.TerminalFormat(true))))

defer func(now time.Time) { log.Info("total time", "time", time.Since(now), "size (kb)", filesize) }(time.Now())
defer func(now time.Time) { log.Info("total time", "time", time.Since(now), "kb", filesize) }(time.Now())

generateEndpoints(scheme, cluster, from, to)
generateEndpoints(scheme, cluster, appName, from, to)

log.Info("uploading to " + endpoints[0] + " and syncing")

Expand Down
Loading