log collection changes for survey endpoint name change

skycoin · Feb 10, 2024 · 0083821 · 0083821
1 parent 9c1e917
commit 0083821
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 18 deletions.
diff --git a/cmd/skywire-cli/commands/log/root.go b/cmd/skywire-cli/commands/log/root.go
@@ -79,6 +79,10 @@ var logCmd = &cobra.Command{
 	Long:  "Fetch health, survey, and transport logging from visors which are online in the uptime tracker\nhttp://ut.skywire.skycoin.com/uptimes?v=v2\nhttp://ut.skywire.skycoin.com/uptimes?v=v2&visors=<pk1>;<pk2>;<pk3>",
 	Run: func(cmd *cobra.Command, args []string) {
 		log := logging.MustGetLogger("log-collecting")
+		fver, err := version.NewVersion("v1.3.17")
+		if err != nil {
+			log.Fatal("can't parse version for filtering fetches")
+		}
 		if logOnly && surveyOnly {
 			log.Fatal("use of mutually exclusive flags --log and --survey")
 		}
@@ -202,7 +206,11 @@ var logCmd = &cobra.Command{
 							}
 						}
 						if !logOnly {
-							download(ctx, log, httpC, "node-info.json", "node-info.json", key, maxFileSize) //nolint
+							if visorVersion.LessThan(fver) {
+								download(ctx, log, httpC, "node-info.json", "node-info.json", key, maxFileSize) //nolint
+							} else {
+								download(ctx, log, httpC, "node-info", "node-info.json", key, maxFileSize) //nolint
+							}
 						}
 						if !surveyOnly {
 							for i := 0; i <= duration; i++ {

diff --git a/cmd/skywire-cli/commands/reward/calc.go → cmd/skywire-cli/commands/rewards/calc.go b/cmd/skywire-cli/commands/reward/calc.go → cmd/skywire-cli/commands/rewards/calc.go
@@ -1,5 +1,5 @@
-// Package clireward cmd/skywire-cli/commands/reward/root.go
-package clireward
+// Package clireward cmd/skywire-cli/commands/rewards/root.go
+package clirewards
 
 import (
 	"fmt"
@@ -54,23 +54,21 @@ type rewardData struct {
 }
 
 func init() {
-	RootCmd.AddCommand(rewardCalcCmd)
-	rewardCalcCmd.Flags().SortFlags = false
-	rewardCalcCmd.Flags().StringVarP(&wdate, "date", "d", wdate, "date for which to calculate reward")
-	rewardCalcCmd.Flags().StringVarP(&pubkey, "pk", "k", pubkey, "check reward for pubkey")
-	rewardCalcCmd.Flags().StringVarP(&disallowArchitectures, "noarch", "n", "amd64", "disallowed architectures, comma separated")
-	rewardCalcCmd.Flags().IntVarP(&yearlyTotal, "year", "y", yearlyTotalRewards, "yearly total rewards")
-	rewardCalcCmd.Flags().StringVarP(&utfile, "utfile", "u", "ut.txt", "uptime tracker data file")
-	rewardCalcCmd.Flags().StringVarP(&surveyPath, "path", "p", "log_collecting", "path to the surveys")
-	rewardCalcCmd.Flags().BoolVarP(&h0, "h0", "0", false, "hide statistical data")
-	rewardCalcCmd.Flags().BoolVarP(&h1, "h1", "1", false, "hide survey csv data")
-	rewardCalcCmd.Flags().BoolVarP(&h2, "h2", "2", false, "hide reward csv data")
-	rewardCalcCmd.Flags().BoolVarP(&grr, "err", "e", false, "account for non rewarded keys")
-
+	RootCmd.Flags().SortFlags = false
+	RootCmd.Flags().StringVarP(&wdate, "date", "d", wdate, "date for which to calculate reward")
+	RootCmd.Flags().StringVarP(&pubkey, "pk", "k", pubkey, "check reward for pubkey")
+	RootCmd.Flags().StringVarP(&disallowArchitectures, "noarch", "n", "amd64", "disallowed architectures, comma separated")
+	RootCmd.Flags().IntVarP(&yearlyTotal, "year", "y", yearlyTotalRewards, "yearly total rewards")
+	RootCmd.Flags().StringVarP(&utfile, "utfile", "u", "ut.txt", "uptime tracker data file")
+	RootCmd.Flags().StringVarP(&surveyPath, "path", "p", "log_collecting", "path to the surveys")
+	RootCmd.Flags().BoolVarP(&h0, "h0", "0", false, "hide statistical data")
+	RootCmd.Flags().BoolVarP(&h1, "h1", "1", false, "hide survey csv data")
+	RootCmd.Flags().BoolVarP(&h2, "h2", "2", false, "hide reward csv data")
+	RootCmd.Flags().BoolVarP(&grr, "err", "e", false, "account for non rewarded keys")
 }
 
-var rewardCalcCmd = &cobra.Command{
-	Use:   "calc",
+var RootCmd = &cobra.Command{
+	Use:   "rewards",
 	Short: "calculate rewards from uptime data & collected surveys",
 	Long: `
 Collect surveys:  skywire-cli log

diff --git a/cmd/skywire-cli/commands/root.go b/cmd/skywire-cli/commands/root.go
@@ -21,6 +21,7 @@ import (
 	climdisc "github.com/skycoin/skywire/cmd/skywire-cli/commands/mdisc"
 	cliskysocksc "github.com/skycoin/skywire/cmd/skywire-cli/commands/proxy"
 	clireward "github.com/skycoin/skywire/cmd/skywire-cli/commands/reward"
+	clirewards "github.com/skycoin/skywire/cmd/skywire-cli/commands/rewards"
 	clirtfind "github.com/skycoin/skywire/cmd/skywire-cli/commands/rtfind"
 	cliservices "github.com/skycoin/skywire/cmd/skywire-cli/commands/services"
 	cliskyfwd "github.com/skycoin/skywire/cmd/skywire-cli/commands/skyfwd"
@@ -189,6 +190,7 @@ func init() {
 		cliskyfwd.RootCmd,
 		cliskyrev.RootCmd,
 		clireward.RootCmd,
+		clirewards.RootCmd,
 		clisurvey.RootCmd,
 		clirtfind.RootCmd,
 		climdisc.RootCmd,