JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

storagenode-updater: process storagenode config

Browse Source 
Change-Id: I452dd4422ae660ca46d7f4525358c8e809ba0d75
This commit is contained in:
Yaroslav Vorobiov 2020-06-09 00:25:30 +03:00
parent 8abb907010
commit 75ab3507dd
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/storagenode-updater/cmd.go
View File

@ -15,13 +15,12 @@ import (
"storj.io/common/errs2"
"storj.io/common/fpath"
"storj.io/common/identity"
"storj.io/common/storj"
"storj.io/common/sync2"
"storj.io/private/cfgstruct"
"storj.io/private/process"
_ "storj.io/storj/private/version" // This attaches version information during release builds.
"storj.io/storj/private/version/checker"
"storj.io/storj/storagenode"
)
const (
@ -51,8 +50,7 @@ var (
}
runCfg struct {
checker.Config
Identity identity.Config
storagenode.Config
BinaryLocation string `help:"the storage node executable binary location" default:"storagenode.exe"`
ServiceName string `help:"storage node OS service name" default:"storagenode"`
@ -101,17 +99,17 @@ func cmdRun(cmd *cobra.Command, args []string) (err error) {
ctx, _ := process.Ctx(cmd)
switch {
case runCfg.CheckInterval <= 0:
case runCfg.Version.CheckInterval <= 0:
err = loopFunc(ctx)
case runCfg.CheckInterval < minCheckInterval:
case runCfg.Version.CheckInterval < minCheckInterval:
zap.L().Error("Check interval below minimum. Overriding it minimum.",
zap.Stringer("Check Interval", runCfg.CheckInterval),
zap.Stringer("Check Interval", runCfg.Version.CheckInterval),
zap.Stringer("Minimum Check Interval", minCheckInterval),
)
runCfg.CheckInterval = minCheckInterval
runCfg.Version.CheckInterval = minCheckInterval
fallthrough
default:
loop := sync2.NewCycle(runCfg.CheckInterval)
loop := sync2.NewCycle(runCfg.Version.CheckInterval)
err = loop.Run(ctx, loopFunc)
}
if err != nil && !errs2.IsCanceled(err) {

4
cmd/storagenode-updater/cmd_test.go
View File

@ -89,9 +89,9 @@ func TestAutoUpdater(t *testing.T) {
// run updater (update)
args := []string{"run",
"--config-dir", ctx.Dir(),
"--server-address", "http://" + versionControlPeer.Addr(),
"--version.server-address", "http://" + versionControlPeer.Addr(),
"--binary-location", storagenodePath,
"--check-interval", "0s",
"--version.check-interval", "0s",
"--identity.cert-path", identConfig.CertPath,
"--identity.key-path", identConfig.KeyPath,
"--log", logPath,

4
cmd/storagenode-updater/loop.go
View File

@ -16,9 +16,9 @@ import (
// loopFunc is func that is run by the update cycle.
func loopFunc(ctx context.Context) error {
zap.L().Info("Downloading versions.", zap.String("Server Address", runCfg.ServerAddress))
zap.L().Info("Downloading versions.", zap.String("Server Address", runCfg.Version.ServerAddress))
all, err := checker.New(runCfg.ClientConfig).All(ctx)
all, err := checker.New(runCfg.Version.ClientConfig).All(ctx)
if err != nil {
zap.L().Error("Error retrieving version info.", zap.Error(err))
return nil

4
cmd/storagenode-updater/loop_windows.go
View File

@ -19,9 +19,9 @@ import (
// loopFunc is func that is run by the update cycle.
func loopFunc(ctx context.Context) error {
zap.L().Info("Downloading versions.", zap.String("Server Address", runCfg.ServerAddress))
zap.L().Info("Downloading versions.", zap.String("Server Address", runCfg.Version.ServerAddress))
all, err := checker.New(runCfg.ClientConfig).All(ctx)
all, err := checker.New(runCfg.Version.ClientConfig).All(ctx)
if err != nil {
zap.L().Error("Error retrieving version info.", zap.Error(err))
return nil