Merge pull request #56 from linwujia/master

linwujia · web-flow · commit 174e7435003c · 2022-09-15T11:36:44.000+08:00
Added support for etc currency
diff --git a/Config.go b/Config.go
@@ -132,6 +132,12 @@ func (conf *Config) Init() {
 	switch conf.AgentType {
 	case "btc":
 		conf.sessionFactory = new(SessionFactoryBTC)
+	case "etc":
+		fallthrough
+	case "ethw":
+		fallthrough
+	case "etf":
+		fallthrough
 	case "eth":
 		conf.sessionFactory = new(SessionFactoryETH)
 	default:
diff --git a/DownSessionETH.go b/DownSessionETH.go
@@ -386,14 +386,15 @@ func (down *DownSessionETH) handleRequest() {
 			return
 		}
 		if glog.V(11) {
-			glog.Info(down.id, "handleRequest: ", string(jsonBytes))
+			glog.Info(down.id, "handleRequest: ", string(jsonBytes), ", len=", len(jsonBytes), ", hex=", hex.EncodeToString(jsonBytes))
 		}
 
 		rpcData, err := NewJSONRPCLineETH(jsonBytes)
 
 		// ignore the json decode error
 		if err != nil {
-			glog.Warning(down.id, "failed to decode JSON from miner: ", err.Error(), "; ", string(jsonBytes))
+			glog.Warning(down.id, "failed to decode JSON from miner: ", err.Error(), "; ", string(jsonBytes), ", len=", len(jsonBytes), ", hex=", hex.EncodeToString(jsonBytes))
+			continue
 		}
 
 		down.SendEvent(EventRecvJSONRPCETH{rpcData, jsonBytes})

Original file line number	Diff line number	Diff line change
`@@ -386,14 +386,15 @@ func (down *DownSessionETH) handleRequest() {`
`386`	`386`	`return`
`387`	`387`	`}`
`388`	`388`	`if glog.V(11) {`
`389`		`- glog.Info(down.id, "handleRequest: ", string(jsonBytes))`
	`389`	`+ glog.Info(down.id, "handleRequest: ", string(jsonBytes), ", len=", len(jsonBytes), ", hex=", hex.EncodeToString(jsonBytes))`
`390`	`390`	`}`
`391`	`391`
`392`	`392`	`rpcData, err := NewJSONRPCLineETH(jsonBytes)`
`393`	`393`
`394`	`394`	`// ignore the json decode error`
`395`	`395`	`if err != nil {`
`396`		`- glog.Warning(down.id, "failed to decode JSON from miner: ", err.Error(), "; ", string(jsonBytes))`
	`396`	`+ glog.Warning(down.id, "failed to decode JSON from miner: ", err.Error(), "; ", string(jsonBytes), ", len=", len(jsonBytes), ", hex=", hex.EncodeToString(jsonBytes))`
	`397`	`+ continue`
`397`	`398`	`}`
`398`	`399`
`399`	`400`	`down.SendEvent(EventRecvJSONRPCETH{rpcData, jsonBytes})`