aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/wnode
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-02-22 23:22:50 +0800
committerPéter Szilágyi <peterke@gmail.com>2017-02-23 18:16:46 +0800
commit1ca20a2697e5df840a0541b61f274379b43fddc7 (patch)
tree6fc5d566164c5fd960d91f0b88588d0688e715bd /cmd/wnode
parent23a5d64fd059bb8bdf02781608a15b8b1bdbdfd2 (diff)
downloaddexon-1ca20a2697e5df840a0541b61f274379b43fddc7.tar
dexon-1ca20a2697e5df840a0541b61f274379b43fddc7.tar.gz
dexon-1ca20a2697e5df840a0541b61f274379b43fddc7.tar.bz2
dexon-1ca20a2697e5df840a0541b61f274379b43fddc7.tar.lz
dexon-1ca20a2697e5df840a0541b61f274379b43fddc7.tar.xz
dexon-1ca20a2697e5df840a0541b61f274379b43fddc7.tar.zst
dexon-1ca20a2697e5df840a0541b61f274379b43fddc7.zip
cmd, whisper/mailserver: revert to utils.Fatalf
Diffstat (limited to 'cmd/wnode')
-rw-r--r--cmd/wnode/main.go36
1 files changed, 18 insertions, 18 deletions
diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go
index eb0dd2511..8191f9292 100644
--- a/cmd/wnode/main.go
+++ b/cmd/wnode/main.go
@@ -108,7 +108,7 @@ func processArgs() {
var err error
nodeid, err = crypto.LoadECDSA(*argIDFile)
if err != nil {
- log.Crit(fmt.Sprintf("Failed to load file [%s]: %s.", *argIDFile, err))
+ utils.Fatalf("Failed to load file [%s]: %s.", *argIDFile, err)
}
}
@@ -122,7 +122,7 @@ func processArgs() {
if len(*argTopic) > 0 {
x, err := hex.DecodeString(*argTopic)
if err != nil {
- log.Crit(fmt.Sprintf("Failed to parse the topic: %s", err))
+ utils.Fatalf("Failed to parse the topic: %s", err)
}
topic = whisper.BytesToTopic(x)
}
@@ -130,7 +130,7 @@ func processArgs() {
if *asymmetricMode && len(*argPub) > 0 {
pub = crypto.ToECDSAPub(common.FromHex(*argPub))
if !isKeyValid(pub) {
- log.Crit(fmt.Sprintf("invalid public key"))
+ utils.Fatalf("invalid public key")
}
}
@@ -161,7 +161,7 @@ func initialize() {
if *generateKey {
key, err := crypto.GenerateKey()
if err != nil {
- log.Crit(fmt.Sprintf("Failed to generate private key: %s", err))
+ utils.Fatalf("Failed to generate private key: %s", err)
}
k := hex.EncodeToString(crypto.FromECDSA(key))
fmt.Printf("Random private key: %s \n", k)
@@ -189,7 +189,7 @@ func initialize() {
if len(msPassword) == 0 {
msPassword, err = console.Stdin.PromptPassword("Please enter the Mail Server password: ")
if err != nil {
- log.Crit(fmt.Sprintf("Failed to read Mail Server password: %s", err))
+ utils.Fatalf("Failed to read Mail Server password: %s", err)
}
}
shh = whisper.New()
@@ -227,7 +227,7 @@ func initialize() {
func startServer() {
err := server.Start()
if err != nil {
- log.Crit(fmt.Sprintf("Failed to start Whisper peer: %s.", err))
+ utils.Fatalf("Failed to start Whisper peer: %s.", err)
}
fmt.Printf("my public key: %s \n", common.ToHex(crypto.FromECDSAPub(&asymKey.PublicKey)))
@@ -265,7 +265,7 @@ func configureNode() {
s := scanLine("Please enter the peer's public key: ")
pub = crypto.ToECDSAPub(common.FromHex(s))
if !isKeyValid(pub) {
- log.Crit(fmt.Sprintf("Error: invalid public key"))
+ utils.Fatalf("Error: invalid public key")
}
}
}
@@ -275,7 +275,7 @@ func configureNode() {
if len(msPassword) == 0 {
msPassword, err = console.Stdin.PromptPassword("Please enter the Mail Server password: ")
if err != nil {
- log.Crit(fmt.Sprintf("Failed to read Mail Server password: %s", err))
+ utils.Fatalf("Failed to read Mail Server password: %s", err)
}
}
}
@@ -284,7 +284,7 @@ func configureNode() {
if len(symPass) == 0 {
symPass, err = console.Stdin.PromptPassword("Please enter the password: ")
if err != nil {
- log.Crit(fmt.Sprintf("Failed to read passphrase: %v", err))
+ utils.Fatalf("Failed to read passphrase: %v", err)
}
}
@@ -330,7 +330,7 @@ func waitForConnection(timeout bool) {
if timeout {
cnt++
if cnt > 1000 {
- log.Crit(fmt.Sprintf("Timeout expired, failed to connect"))
+ utils.Fatalf("Timeout expired, failed to connect")
}
}
}
@@ -382,7 +382,7 @@ func scanLine(prompt string) string {
}
txt, err := input.ReadString('\n')
if err != nil {
- log.Crit(fmt.Sprintf("input error: %s", err))
+ utils.Fatalf("input error: %s", err)
}
txt = strings.TrimRight(txt, "\n\r")
return txt
@@ -397,7 +397,7 @@ func scanUint(prompt string) uint32 {
s := scanLine(prompt)
i, err := strconv.Atoi(s)
if err != nil {
- log.Crit(fmt.Sprintf("Fail to parse the lower time limit: %s", err))
+ utils.Fatalf("Fail to parse the lower time limit: %s", err)
}
return uint32(i)
}
@@ -430,7 +430,7 @@ func sendMsg(payload []byte) {
func messageLoop() {
f := shh.GetFilter(filterID)
if f == nil {
- log.Crit(fmt.Sprintf("filter is not installed"))
+ utils.Fatalf("filter is not installed")
}
ticker := time.NewTicker(time.Millisecond * 50)
@@ -472,7 +472,7 @@ func requestExpiredMessagesLoop() {
err := shh.AddSymKey(mailserver.MailServerKeyName, []byte(msPassword))
if err != nil {
- log.Crit(fmt.Sprintf("Failed to create symmetric key for mail request: %s", err))
+ utils.Fatalf("Failed to create symmetric key for mail request: %s", err)
}
key = shh.GetSymKey(mailserver.MailServerKeyName)
peerID = extractIdFromEnode(*argEnode)
@@ -485,7 +485,7 @@ func requestExpiredMessagesLoop() {
if len(t) >= whisper.TopicLength*2 {
x, err := hex.DecodeString(t)
if err != nil {
- log.Crit(fmt.Sprintf("Failed to parse the topic: %s", err))
+ utils.Fatalf("Failed to parse the topic: %s", err)
}
xt = whisper.BytesToTopic(x)
}
@@ -511,12 +511,12 @@ func requestExpiredMessagesLoop() {
msg := whisper.NewSentMessage(&params)
env, err := msg.Wrap(&params)
if err != nil {
- log.Crit(fmt.Sprintf("Wrap failed: %s", err))
+ utils.Fatalf("Wrap failed: %s", err)
}
err = shh.RequestHistoricMessages(peerID, env)
if err != nil {
- log.Crit(fmt.Sprintf("Failed to send P2P message: %s", err))
+ utils.Fatalf("Failed to send P2P message: %s", err)
}
time.Sleep(time.Second * 5)
@@ -526,7 +526,7 @@ func requestExpiredMessagesLoop() {
func extractIdFromEnode(s string) []byte {
n, err := discover.ParseNode(s)
if err != nil {
- log.Crit(fmt.Sprintf("Failed to parse enode: %s", err))
+ utils.Fatalf("Failed to parse enode: %s", err)
return nil
}
return n.ID[:]