Fix output of build info on start

skycoin · Jan 29, 2020 · d030716 · d030716
1 parent 0b17b15
commit d030716
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 28 deletions.
diff --git a/cmd/dmsgpty/commands/root.go b/cmd/dmsgpty/commands/root.go
@@ -10,6 +10,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/SkycoinProject/skywire-mainnet/internal/skyenv"
+	"github.com/SkycoinProject/skywire-mainnet/pkg/buildinfo"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/dmsgpty"
 )
 
@@ -32,6 +33,10 @@ var rootCmd = &cobra.Command{
 	Use:   "dmsgpty",
 	Short: "Run commands over dmsg",
 	PreRunE: func(*cobra.Command, []string) error {
+		if _, err := buildinfo.Get().WriteTo(log.Writer()); err != nil {
+			log.Printf("Failed to output build info: %v", err)
+		}
+
 		return readDstAddr()
 	},
 	RunE: func(*cobra.Command, []string) error {

diff --git a/cmd/dmsgpty/dmsgpty.go b/cmd/dmsgpty/dmsgpty.go
@@ -1,16 +1,9 @@
 package main
 
 import (
-	"log"
-
 	"github.com/SkycoinProject/skywire-mainnet/cmd/dmsgpty/commands"
-	"github.com/SkycoinProject/skywire-mainnet/pkg/buildinfo"
 )
 
 func main() {
-	if _, err := buildinfo.Get().WriteTo(log.Writer()); err != nil {
-		log.Printf("Failed to output build info: %v", err)
-	}
-
 	commands.Execute()
 }
diff --git a/cmd/hypervisor/commands/root.go b/cmd/hypervisor/commands/root.go
@@ -3,13 +3,15 @@ package commands
 import (
 	"fmt"
 	"net/http"
+	"os"
 
 	"github.com/SkycoinProject/dmsg"
 	"github.com/SkycoinProject/dmsg/disc"
 
 	"github.com/SkycoinProject/skycoin/src/util/logging"
 	"github.com/spf13/cobra"
 
+	"github.com/SkycoinProject/skywire-mainnet/pkg/buildinfo"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/hypervisor"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil"
 )
@@ -43,6 +45,10 @@ var rootCmd = &cobra.Command{
 	Use:   "hypervisor",
 	Short: "Manages Skywire App Nodes",
 	Run: func(_ *cobra.Command, args []string) {
+		if _, err := buildinfo.Get().WriteTo(os.Stdout); err != nil {
+			log.Printf("Failed to output build info: %v", err)
+		}
+
 		if configPath == "" {
 			configPath = pathutil.FindConfigPath(args, -1, configEnv, pathutil.HypervisorDefaults())
 		}

diff --git a/cmd/hypervisor/hypervisor.go b/cmd/hypervisor/hypervisor.go
@@ -4,16 +4,9 @@ skywire hypervisor
 package main
 
 import (
-	"log"
-
 	"github.com/SkycoinProject/skywire-mainnet/cmd/hypervisor/commands"
-	"github.com/SkycoinProject/skywire-mainnet/pkg/buildinfo"
 )
 
 func main() {
-	if _, err := buildinfo.Get().WriteTo(log.Writer()); err != nil {
-		log.Printf("Failed to output build info: %v", err)
-	}
-
 	commands.Execute()
 }
diff --git a/cmd/setup-node/commands/root.go b/cmd/setup-node/commands/root.go
@@ -14,6 +14,7 @@ import (
 	logrussyslog "github.com/sirupsen/logrus/hooks/syslog"
 	"github.com/spf13/cobra"
 
+	"github.com/SkycoinProject/skywire-mainnet/pkg/buildinfo"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/metrics"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/setup"
 )
@@ -29,6 +30,9 @@ var rootCmd = &cobra.Command{
 	Use:   "setup-node [config.json]",
 	Short: "Route Setup Node for skywire",
 	Run: func(_ *cobra.Command, args []string) {
+		if _, err := buildinfo.Get().WriteTo(log.Writer()); err != nil {
+			log.Printf("Failed to output build info: %v", err)
+		}
 
 		logger := logging.MustGetLogger(tag)
 		if syslogAddr != "" {

diff --git a/cmd/setup-node/setup-node.go b/cmd/setup-node/setup-node.go
@@ -1,16 +1,9 @@
 package main
 
 import (
-	"log"
-
 	"github.com/SkycoinProject/skywire-mainnet/cmd/setup-node/commands"
-	"github.com/SkycoinProject/skywire-mainnet/pkg/buildinfo"
 )
 
 func main() {
-	if _, err := buildinfo.Get().WriteTo(log.Writer()); err != nil {
-		log.Printf("Failed to output build info: %v", err)
-	}
-
 	commands.Execute()
 }
diff --git a/cmd/skywire-visor/commands/root.go b/cmd/skywire-visor/commands/root.go
@@ -59,6 +59,10 @@ var rootCmd = &cobra.Command{
 	Use:   "skywire-visor [config-path]",
 	Short: "Visor for skywire",
 	Run: func(_ *cobra.Command, args []string) {
+		if _, err := buildinfo.Get().WriteTo(log.Writer()); err != nil {
+			log.Printf("Failed to output build info: %v", err)
+		}
+
 		cfg.args = args
 
 		cfg.startProfiler().

diff --git a/cmd/skywire-visor/skywire-visor.go b/cmd/skywire-visor/skywire-visor.go
@@ -4,16 +4,9 @@ skywire visor
 package main
 
 import (
-	"log"
-
 	"github.com/SkycoinProject/skywire-mainnet/cmd/skywire-visor/commands"
-	"github.com/SkycoinProject/skywire-mainnet/pkg/buildinfo"
 )
 
 func main() {
-	if _, err := buildinfo.Get().WriteTo(log.Writer()); err != nil {
-		log.Printf("Failed to output build info: %v", err)
-	}
-
 	commands.Execute()
 }