Initial syslog support

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

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go
index 606caf0ede5ccbb32c0e0e267dbadfc9d6f59793..4b4206560e834877ba7a6400f588575b1547455e 100644 (file)
--- a/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go
@@ -38,6 +38,7 @@ var (
        stats    = flag.String("stats", "", "Enable stats retrieving on host:port")
        proxy    = flag.String("proxy", "", "Enable HTTP proxy on host:port")
        egdPath  = flag.String("egd", "", "Optional path to EGD socket")
+       syslog   = flag.Bool("syslog", false, "Enable logging to syslog")
        warranty = flag.Bool("warranty", false, "Print warranty information")
 )
 
@@ -88,7 +89,12 @@ func main() {
        if *proxy != "" {
                go proxyStart()
        }
+
+       if *syslog {
+               govpn.SyslogEnable()
+       }
        log.Println("Server started")
+       govpn.Println("Server started")
 
        var needsDeletion bool
 MainCycle:
@@ -96,6 +102,7 @@ MainCycle:
                select {
                case <-termSignal:
                        log.Println("Terminating")
+                       govpn.Println("Terminating")
                        for _, ps := range peers {
                                govpn.ScriptCall(
                                        confs[*ps.peer.Id].Down,
@@ -109,7 +116,7 @@ MainCycle:
                        hsLock.Lock()
                        for addr, hs := range handshakes {
                                if hs.LastPing.Add(timeout).Before(now) {
-                                       log.Println("Deleting handshake state", addr)
+                                       govpn.Println("Deleting handshake state", addr)
                                        hs.Zero()
                                        delete(handshakes, addr)
                                }
@@ -122,7 +129,7 @@ MainCycle:
                                needsDeletion = ps.peer.LastPing.Add(timeout).Before(now)
                                ps.peer.BusyR.Unlock()
                                if needsDeletion {
-                                       log.Println("Deleting peer", ps.peer)
+                                       govpn.Println("Deleting peer", ps.peer)
                                        delete(peers, addr)
                                        delete(knownPeers, addr)
                                        delete(peersById, *ps.peer.Id)