Humanized priorities

[nncp.git] / src / cypherpunks.ru / nncp / cmd / nncp-daemon / main.go

diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-daemon/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-daemon/main.go
index 9ed14d2e814c1a41dfe420866154a0d846129cca..ba2d602c005f0ebf9bc46fb6774f01afa2db37ef 100644 (file)
--- a/src/cypherpunks.ru/nncp/cmd/nncp-daemon/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-daemon/main.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@ package main
 import (
        "flag"
        "fmt"
-       "io/ioutil"
        "log"
        "net"
        "os"
@@ -34,20 +33,23 @@ import (
 
 func usage() {
        fmt.Fprintf(os.Stderr, nncp.UsageHeader())
-       fmt.Fprintln(os.Stderr, "nncp-daemon -- TCP daemon\n")
-       fmt.Fprintf(os.Stderr, "Usage: %s [options]\nOptions:", os.Args[0])
+       fmt.Fprintf(os.Stderr, "nncp-daemon -- TCP daemon\n\n")
+       fmt.Fprintf(os.Stderr, "Usage: %s [options]\nOptions:\n", os.Args[0])
        flag.PrintDefaults()
 }
 
 func main() {
        var (
-               cfgPath  = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
-               niceRaw  = flag.Int("nice", 255, "Minimal required niceness")
-               bind     = flag.String("bind", ":5400", "Address to bind to")
-               maxConn  = flag.Int("maxconn", 128, "Maximal number of simultaneous connections")
-               debug    = flag.Bool("debug", false, "Enable debugging information")
-               version  = flag.Bool("version", false, "Print version information")
-               warranty = flag.Bool("warranty", false, "Print warranty information")
+               cfgPath   = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
+               niceRaw   = flag.String("nice", nncp.NicenessFmt(255), "Minimal required niceness")
+               bind      = flag.String("bind", "[::]:5400", "Address to bind to")
+               maxConn   = flag.Int("maxconn", 128, "Maximal number of simultaneous connections")
+               spoolPath = flag.String("spool", "", "Override path to spool")
+               logPath   = flag.String("log", "", "Override path to logfile")
+               quiet     = flag.Bool("quiet", false, "Print only errors")
+               debug     = flag.Bool("debug", false, "Print debug messages")
+               version   = flag.Bool("version", false, "Print version information")
+               warranty  = flag.Bool("warranty", false, "Print warranty information")
        )
        flag.Usage = usage
        flag.Parse()
@@ -59,27 +61,24 @@ func main() {
                fmt.Println(nncp.VersionGet())
                return
        }
-       if *niceRaw < 1 || *niceRaw > 255 {
-               log.Fatalln("-nice must be between 1 and 255")
+       nice, err := nncp.NicenessParse(*niceRaw)
+       if err != nil {
+               log.Fatalln(err)
        }
-       nice := uint8(*niceRaw)
 
-       cfgRaw, err := ioutil.ReadFile(*cfgPath)
+       ctx, err := nncp.CtxFromCmdline(*cfgPath, *spoolPath, *logPath, *quiet, *debug)
        if err != nil {
-               log.Fatalln("Can not read config:", err)
+               log.Fatalln("Error during initialization:", err)
        }
-       ctx, err := nncp.CfgParse(cfgRaw)
-       if err != nil {
-               log.Fatalln("Can not parse config:", err)
+       if ctx.Self == nil {
+               log.Fatalln("Config lacks private keys")
        }
-       ctx.Debug = *debug
 
        ln, err := net.Listen("tcp", *bind)
        if err != nil {
                log.Fatalln("Can not listen:", err)
        }
        ln = netutil.LimitListener(ln, *maxConn)
-       ctx.LogI("daemon", nncp.SDS{"bind": *bind}, "listening")
        for {
                conn, err := ln.Accept()
                if err != nil {
@@ -87,12 +86,12 @@ func main() {
                }
                ctx.LogD("daemon", nncp.SDS{"addr": conn.RemoteAddr()}, "accepted")
                go func(conn net.Conn) {
-                       state, err := ctx.StartR(conn, nice, nil)
+                       state, err := ctx.StartR(conn, nice, "")
                        if err == nil {
-                               ctx.LogI("call-start", nncp.SDS{"node": state.NodeId}, "connected")
+                               ctx.LogI("call-start", nncp.SDS{"node": state.Node.Id}, "connected")
                                state.Wait()
                                ctx.LogI("call-finish", nncp.SDS{
-                                       "node":     state.NodeId,
+                                       "node":     state.Node.Id,
                                        "duration": strconv.FormatInt(int64(state.Duration.Seconds()), 10),
                                        "rxbytes":  strconv.FormatInt(state.RxBytes, 10),
                                        "txbytes":  strconv.FormatInt(state.TxBytes, 10),
@@ -100,7 +99,11 @@ func main() {
                                        "txspeed":  strconv.FormatInt(state.TxSpeed, 10),
                                }, "")
                        } else {
-                               ctx.LogE("call-start", nncp.SDS{"node": state.NodeId, "err": err}, "")
+                               nodeId := "unknown"
+                               if state != nil && state.Node != nil {
+                                       nodeId = state.Node.Id.String()
+                               }
+                               ctx.LogE("call-start", nncp.SDS{"node": nodeId, "err": err}, "")
                        }
                        conn.Close()
                }(conn)