Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add machine ID in version string #1996

Merged
merged 4 commits into from
Jun 24, 2020
Merged

Add machine ID in version string #1996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e520d38
- added machine ID in version string
iulianpascalau Jun 23, 2020
961f4d8
- protected the ID value
iulianpascalau Jun 23, 2020
092f031
Merge branch 'release-candidate' into add-machine-id-in-version
LucianMincu Jun 24, 2020
2223fc9
Merge branch 'release-candidate' into add-machine-id-in-version
iulianpascalau Jun 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 13 additions & 2 deletions cmd/node/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ import (
"github.com/ElrondNetwork/elrond-go/update/trigger"
"github.com/ElrondNetwork/elrond-go/vm"
vmcommon "github.com/ElrondNetwork/elrond-vm-common"
"github.com/denisbrodbeck/machineid"
"github.com/google/gops/agent"
"github.com/urfave/cli"
)
Expand All @@ -90,6 +91,7 @@ const (
secondsToWaitForP2PBootstrap = 20
maxNumGoRoutinesTxsByHashApi = 10
maxTimeToClose = 10 * time.Second
maxMachineIDLen = 10
)

var (
Expand Down Expand Up @@ -388,7 +390,16 @@ func main() {
app := cli.NewApp()
cli.AppHelpTemplate = nodeHelpTemplate
app.Name = "Elrond Node CLI App"
app.Version = fmt.Sprintf("%s/%s/%s-%s", appVersion, runtime.Version(), runtime.GOOS, runtime.GOARCH)
machineID, err := machineid.ProtectedID(app.Name)
if err != nil {
log.Warn("error fetching machine id", "error", err)
machineID = "unknown"
}
if len(machineID) > maxMachineIDLen {
machineID = machineID[:maxMachineIDLen]
}

app.Version = fmt.Sprintf("%s/%s/%s-%s/%s", appVersion, runtime.Version(), runtime.GOOS, runtime.GOARCH, machineID)
app.Usage = "This is the entry point for starting a new Elrond node - the app will start after the genesis timestamp"
app.Flags = []cli.Flag{
genesisFile,
Expand Down Expand Up @@ -439,7 +450,7 @@ func main() {
return startNode(c, log, app.Version)
}

err := app.Run(os.Args)
err = app.Run(os.Args)
if err != nil {
log.Error(err.Error())
os.Exit(1)
Expand Down
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ require (
github.com/beevik/ntp v0.2.0
github.com/btcsuite/btcd v0.20.1-beta
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d
github.com/denisbrodbeck/machineid v1.0.1
github.com/elastic/go-elasticsearch/v7 v7.1.0
github.com/gin-contrib/cors v0.0.0-20190301062745-f9e10995c85a
github.com/gin-contrib/pprof v1.2.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ github.com/davidlazar/go-crypto v0.0.0-20170701192655-dcfb0a7ac018 h1:6xT9KW8zLC
github.com/davidlazar/go-crypto v0.0.0-20170701192655-dcfb0a7ac018/go.mod h1:rQYf4tfk5sSwFsnDg3qYaBxSjsD9S8+59vW0dKUgme4=
github.com/davidlazar/go-crypto v0.0.0-20190912175916-7055855a373f h1:BOaYiTvg8p9vBUXpklC22XSK/mifLF7lG9jtmYYi3Tc=
github.com/davidlazar/go-crypto v0.0.0-20190912175916-7055855a373f/go.mod h1:rQYf4tfk5sSwFsnDg3qYaBxSjsD9S8+59vW0dKUgme4=
github.com/denisbrodbeck/machineid v1.0.1 h1:geKr9qtkB876mXguW2X6TU4ZynleN6ezuMSRhl4D7AQ=
github.com/denisbrodbeck/machineid v1.0.1/go.mod h1:dJUwb7PTidGDeYyUBmXZ2GphQBbjJCrnectwCyxcUSI=
github.com/dgraph-io/badger v1.5.5-0.20190226225317-8115aed38f8f/go.mod h1:VZxzAIRPHRVNRKRo6AXrX9BJegn6il06VMTZVJYCIjQ=
github.com/dgraph-io/badger v1.6.0-rc1/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
Expand Down