Use RFC 5424-like structured log format

[govpn.git] / src / cypherpunks.ru / govpn / cmd / govpn-server / common.go

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/common.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/common.go
index 770ec2256b76d33d38716b267a1c9dc68a818267..691e51c03cc723e6d8d56d1d3165f4adff3a3362 100644 (file)
--- a/src/cypherpunks.ru/govpn/cmd/govpn-server/common.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/common.go
@@ -70,7 +70,7 @@ func callUp(peerId *govpn.PeerId, remoteAddr string) (string, error) {
        if confs[*peerId].Up != "" {
                result, err := govpn.ScriptCall(confs[*peerId].Up, ifaceName, remoteAddr)
                if err != nil {
-                       govpn.Println("Script", confs[*peerId].Up, "call failed", err)
+                       govpn.Printf(`[script-failed bind="%s" path="%s" err="%s"]`, *bindAddr, confs[*peerId].Up, err)
                        return "", err
                }
                if ifaceName == "" {
@@ -82,7 +82,7 @@ func callUp(peerId *govpn.PeerId, remoteAddr string) (string, error) {
                }
        }
        if ifaceName == "" {
-               govpn.Println("Can not obtain interface name for", *peerId)
+               govpn.Printf(`[tap-failed bind="%s" peer="%s"]`, *bindAddr, *peerId)
        }
        return ifaceName, nil
 }