Merge branch 'develop'

[nncp.git] / src / call.go

diff --git a/src/call.go b/src/call.go
index 3f150652bd915f5d1a65d58cf85b8ed9821de549..034ba286884496da6f2a7384ef6c18e0652ded22 100644 (file)
--- a/src/call.go
+++ b/src/call.go
@@ -19,7 +19,6 @@ package nncp
 
 import (
        "net"
-       "strconv"
 
        "github.com/gorhill/cronexpr"
 )
@@ -48,7 +47,13 @@ func (ctx *Ctx) CallNode(
        for _, addr := range addrs {
                sds := SDS{"node": node.Id, "addr": addr}
                ctx.LogD("call", sds, "dialing")
-               conn, err := net.Dial("tcp", addr)
+               var conn ConnDeadlined
+               var err error
+               if addr[0] == '|' {
+                       conn, err = NewPipeConn(addr[1:])
+               } else {
+                       conn, err = net.Dial("tcp", addr)
+               }
                if err != nil {
                        ctx.LogD("call", SdsAdd(sds, SDS{"err": err}), "dialing")
                        continue
@@ -71,17 +76,17 @@ func (ctx *Ctx) CallNode(
                        state.Wait()
                        ctx.LogI("call-finish", SDS{
                                "node":     state.Node.Id,
-                               "duration": strconv.FormatInt(int64(state.Duration.Seconds()), 10),
-                               "rxbytes":  strconv.FormatInt(state.RxBytes, 10),
-                               "txbytes":  strconv.FormatInt(state.TxBytes, 10),
-                               "rxspeed":  strconv.FormatInt(state.RxSpeed, 10),
-                               "txspeed":  strconv.FormatInt(state.TxSpeed, 10),
+                               "duration": int64(state.Duration.Seconds()),
+                               "rxbytes":  state.RxBytes,
+                               "txbytes":  state.TxBytes,
+                               "rxspeed":  state.RxSpeed,
+                               "txspeed":  state.TxSpeed,
                        }, "")
                        isGood = true
                        conn.Close()
                        break
                } else {
-                       ctx.LogE("call-start", SdsAdd(sds, SDS{"err": err}), "")
+                       ctx.LogE("call-start", sds, err, "")
                        conn.Close()
                }
        }