toolshed/abra
toolshed/abra
4
2
Fork 18
Code Issues 29 Pull Requests 3 Packages Releases 40 Activity

fix: log correctly on provisioning
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
decentral1se 2021-10-26 01:30:23 +02:00
parent 066b2b9373
commit b3496ad286
No known key found for this signature in database
GPG Key ID: 5E2EF5A63E3718CC
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cli/server/add.go
View File

@ -247,18 +247,20 @@ func initSwarmLocal(c *cli.Context, cl *dockerClient.Client, domainName string)
if !strings.Contains(err.Error(), "is already part of a swarm") { if !strings.Contains(err.Error(), "is already part of a swarm") {
return err return err
} }
} logrus.Info("swarm mode already initialised on local server")
} else {
logrus.Infof("initialised swarm mode on local server") logrus.Infof("initialised swarm mode on local server")
}
netOpts := types.NetworkCreate{Driver: "overlay", Scope: "swarm"} netOpts := types.NetworkCreate{Driver: "overlay", Scope: "swarm"}
if _, err := cl.NetworkCreate(c.Context, "proxy", netOpts); err != nil { if _, err := cl.NetworkCreate(c.Context, "proxy", netOpts); err != nil {
if !strings.Contains(err.Error(), "is already part of a swarm") { if !strings.Contains(err.Error(), "proxy already exists") {
return err return err
} }
} logrus.Info("swarm overlay network already created on local server")
} else {
logrus.Infof("swarm overlay network created on local server") logrus.Infof("swarm overlay network created on local server")
}
return nil return nil
} }
@ -299,18 +301,20 @@ func initSwarm(c *cli.Context, cl *dockerClient.Client, domainName string) error
if !strings.Contains(err.Error(), "is already part of a swarm") { if !strings.Contains(err.Error(), "is already part of a swarm") {
return err return err
} }
} logrus.Info("swarm mode already initialised on %s", domainName)
} else {
logrus.Infof("initialised swarm mode on %s", domainName) logrus.Infof("initialised swarm mode on %s", domainName)
}
netOpts := types.NetworkCreate{Driver: "overlay", Scope: "swarm"} netOpts := types.NetworkCreate{Driver: "overlay", Scope: "swarm"}
if _, err := cl.NetworkCreate(c.Context, "proxy", netOpts); err != nil { if _, err := cl.NetworkCreate(c.Context, "proxy", netOpts); err != nil {
if !strings.Contains(err.Error(), "is already part of a swarm") { if !strings.Contains(err.Error(), "proxy already exists") {
return err return err
} }
} logrus.Infof("swarm overlay network already created on %s", domainName)
} else {
logrus.Infof("swarm overlay network created on %s", domainName) logrus.Infof("swarm overlay network created on %s", domainName)
}
return nil return nil
} }