Clean implementation of JSONRPC server
This commit is contained in:
committed by
Brendan Le Glaunec
parent
1dadb93452
commit
6d296b84d5
@@ -37,8 +37,6 @@ func (c *Cameradar) handleRequest(message string) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
println("1")
|
|
||||||
|
|
||||||
validate := v.New()
|
validate := v.New()
|
||||||
err = validate.Struct(request)
|
err = validate.Struct(request)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -50,10 +48,8 @@ func (c *Cameradar) handleRequest(message string) {
|
|||||||
c.respondToClient(ret, request.ID, JSONRPCErr)
|
c.respondToClient(ret, request.ID, JSONRPCErr)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
println("1")
|
|
||||||
|
|
||||||
c.SetOptions(request.Params)
|
c.SetOptions(request.Params)
|
||||||
println("2")
|
|
||||||
|
|
||||||
switch request.Method {
|
switch request.Method {
|
||||||
case "discover":
|
case "discover":
|
||||||
@@ -72,7 +68,6 @@ func (c *Cameradar) handleRequest(message string) {
|
|||||||
Data: "method" + request.Method + "not found",
|
Data: "method" + request.Method + "not found",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
println("3")
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
JSONRPCErr = jsonrpc2.Error{
|
JSONRPCErr = jsonrpc2.Error{
|
||||||
Code: jsonrpc2.InternalError,
|
Code: jsonrpc2.InternalError,
|
||||||
@@ -81,7 +76,6 @@ func (c *Cameradar) handleRequest(message string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
println("4")
|
|
||||||
c.respondToClient(ret, request.ID, JSONRPCErr)
|
c.respondToClient(ret, request.ID, JSONRPCErr)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -139,7 +133,6 @@ func (c *Cameradar) discoverAndAttack(ID string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c *Cameradar) respondToClient(result []cmrdr.Stream, ID string, JSONRPCErr jsonrpc2.Error) {
|
func (c *Cameradar) respondToClient(result []cmrdr.Stream, ID string, JSONRPCErr jsonrpc2.Error) {
|
||||||
println(result)
|
|
||||||
r := jsonrpc2.Response{
|
r := jsonrpc2.Response{
|
||||||
JSONRPC: "2.0",
|
JSONRPC: "2.0",
|
||||||
Result: result,
|
Result: result,
|
||||||
|
|||||||
Reference in New Issue
Block a user