Skip to content

Commit

Permalink
feat: Print version information when the system starts up (#620)
Browse files Browse the repository at this point in the history
Signed-off-by: santong <[email protected]>
  • Loading branch information
244372610 authored and gaius-qi committed Jun 28, 2023
1 parent 1a4654e commit bd08265
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 0 deletions.
3 changes: 3 additions & 0 deletions cmd/cdn/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"d7y.io/dragonfly/v2/cmd/dependency"
logger "d7y.io/dragonfly/v2/internal/dflog"
"d7y.io/dragonfly/v2/internal/dflog/logcore"
"d7y.io/dragonfly/v2/version"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"gopkg.in/yaml.v3"
Expand Down Expand Up @@ -69,8 +70,10 @@ func init() {
}

func runCdnSystem() error {
logger.Infof("Version:\n%s", version.Version())
// cdn system config values
s, _ := yaml.Marshal(cfg)

logger.Infof("cdn system configuration:\n%s", string(s))

ff := dependency.InitMonitor(cfg.Verbose, cfg.PProfPort, cfg.Telemetry)
Expand Down
3 changes: 3 additions & 0 deletions cmd/dfget/cmd/daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"d7y.io/dragonfly/v2/internal/dfpath"
"d7y.io/dragonfly/v2/pkg/basic/dfnet"
"d7y.io/dragonfly/v2/pkg/rpc/dfdaemon/client"
"d7y.io/dragonfly/v2/version"
"github.com/gofrs/flock"
"github.com/pkg/errors"
"github.com/spf13/cobra"
Expand Down Expand Up @@ -88,6 +89,8 @@ func init() {
}

func runDaemon() error {
logger.Infof("Version:\n%s", version.Version())

target := dfnet.NetAddr{Type: dfnet.UNIX, Addr: dfpath.DaemonSockPath}
daemonClient, err := client.GetClientByAddr([]dfnet.NetAddr{target})
if err != nil {
Expand Down
2 changes: 2 additions & 0 deletions cmd/dfget/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ func init() {

// runDfget does some init operations and starts to download.
func runDfget() error {
logger.Infof("Version:\n%s", version.Version())

// Dfget config values
s, _ := yaml.Marshal(dfgetConfig)
logger.Infof("client dfget configuration:\n%s", string(s))
Expand Down
2 changes: 2 additions & 0 deletions cmd/manager/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"d7y.io/dragonfly/v2/internal/dflog/logcore"
"d7y.io/dragonfly/v2/manager"
"d7y.io/dragonfly/v2/manager/config"
"d7y.io/dragonfly/v2/version"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"gopkg.in/yaml.v3"
Expand Down Expand Up @@ -74,6 +75,7 @@ func init() {
}

func runManager() error {
logger.Infof("Version:\n%s", version.Version())
// manager config values
s, err := yaml.Marshal(cfg)

Expand Down
4 changes: 4 additions & 0 deletions cmd/scheduler/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"d7y.io/dragonfly/v2/internal/dflog/logcore"
"d7y.io/dragonfly/v2/scheduler"
"d7y.io/dragonfly/v2/scheduler/config"
"d7y.io/dragonfly/v2/version"
)

var (
Expand Down Expand Up @@ -80,8 +81,11 @@ func init() {
}

func runScheduler() error {
logger.Infof("Version:\n%s", version.Version())

// scheduler config values
s, _ := yaml.Marshal(cfg)

logger.Infof("scheduler configuration:\n%s", string(s))

ff := dependency.InitMonitor(cfg.Verbose, cfg.PProfPort, cfg.Telemetry)
Expand Down
7 changes: 7 additions & 0 deletions version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package version

import "fmt"

var (
Major = "2"
Minor = "0"
Expand All @@ -27,3 +29,8 @@ var (
Gotags = "unknown"
Gogcflags = "unknown"
)

func Version() string {
return fmt.Sprintf("Major: %s, Minor: %s, GitVersion: %s, GitCommit: %s, Platform: %s, BuildTime: %s, GoVersion: %s, Gotags: %s, Gogcflags: %s", Major,
Minor, GitVersion, GitCommit, Platform, BuildTime, GoVersion, Gotags, Gogcflags)
}

0 comments on commit bd08265

Please sign in to comment.