compatible fix to support both old gesn.ipc endpoint

Ethersocial · Apr 4, 2019 · 8a9b529 · 8a9b529
1 parent 5b49290
commit 8a9b529
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/cmd/geth/config.go b/cmd/geth/config.go
@@ -22,7 +22,9 @@ import (
 	"fmt"
 	"math/big"
 	"os"
+	"path/filepath"
 	"reflect"
+	"strings"
 	"unicode"
 
 	cli "gopkg.in/urfave/cli.v1"
@@ -104,6 +106,9 @@ func defaultNodeConfig() node.Config {
 	cfg.HTTPModules = append(cfg.HTTPModules, "eth", "shh")
 	cfg.WSModules = append(cfg.WSModules, "eth", "shh")
 	cfg.IPCPath = "geth.ipc"
+	if strings.HasPrefix(filepath.Base(os.Args[0]), "gesn") {
+		cfg.IPCPath = "gesn.ipc"
+	}
 	return cfg
 }
 

diff --git a/node/config.go b/node/config.go
@@ -241,6 +241,9 @@ func (c *Config) NodeName() string {
 	if name == "geth" || name == "geth-testnet" {
 		name = "Gesn"
 	}
+	if name == "gesn" || name == "gesn-testnet" {
+		name = "Gesn"
+	}
 	if c.UserIdent != "" {
 		name += "/" + c.UserIdent
 	}
@@ -260,6 +263,9 @@ func (c *Config) name() string {
 		}
 		return progname
 	}
+	if strings.HasPrefix(filepath.Base(os.Args[0]), "gesn") {
+		return "gesn"
+	}
 	return c.Name
 }
 
@@ -302,7 +308,7 @@ func (c *Config) instanceDir() string {
 		return ""
 	}
 	oldpath := filepath.Join(c.DataDir, "gesn")
-	if common.FileExist(oldpath) {
+	if common.FileExist(oldpath) || strings.HasPrefix(filepath.Base(os.Args[0]), "gesn") {
 		return oldpath
 	}
 	return filepath.Join(c.DataDir, c.name())