feat(cmd): add respond(d) daemon

.gitignore

@@ -24,5 +24,6 @@ _testmain.go
 *.prof
 webroot
 /config.toml
+/config-respondd.toml
 /vendor
 /bin

Gopkg.toml

@@ -56,3 +56,12 @@
 [prune]
   go-tests = true
   unused-packages = true
+
+[[constraint]]
+  name = "github.com/shirou/gopsutil"
+  revision = "01487156ffd97029bd146658b44e4c0d06388d82"
+
+[[constraint]]
+  name = "github.com/Vivena/babelweb2"
+  branch = "junk"
+  source = "github.com/genofire/babelweb2"

cmd/config.go

@@ -1,54 +1,31 @@
 package cmd
 
 import (
-	"fmt"
 	"io/ioutil"
-	"os"
 
 	"github.com/naoina/toml"
 
-	"github.com/FreifunkBremen/yanic/database"
 	"github.com/FreifunkBremen/yanic/respond"
 	"github.com/FreifunkBremen/yanic/runtime"
-	"github.com/FreifunkBremen/yanic/webserver"
 )
 
-// Config represents the whole configuration
-type Config struct {
-	Respondd  respond.Config
-	Webserver webserver.Config
-	Nodes     runtime.NodesConfig
-	Database  database.Config
-}
-
 var (
 	configPath string
 	collector  *respond.Collector
 	nodes      *runtime.Nodes
 )
 
-func loadConfig() *Config {
-	config, err := ReadConfigFile(configPath)
-	if err != nil {
-		fmt.Fprintln(os.Stderr, "unable to load config file:", err)
-		os.Exit(2)
-	}
-	return config
-}
-
 // ReadConfigFile reads a config model from path of a yml file
-func ReadConfigFile(path string) (config *Config, err error) {
-	config = &Config{}
-
+func ReadConfigFile(path string, config interface{}) error {
 	file, err := ioutil.ReadFile(path)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	err = toml.Unmarshal(file, config)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
-	return
+	return nil
 }

cmd/config_test.go

@@ -10,7 +10,9 @@ import (
 func TestReadConfig(t *testing.T) {
 	assert := assert.New(t)
 
-	config, err := ReadConfigFile("../config_example.toml")
+	config := &ServeConfig{}
+	err := ReadConfigFile("../config_example.toml", config)
+
 	assert.NoError(err)
 	assert.NotNil(config)
 
@@ -40,11 +42,11 @@ func TestReadConfig(t *testing.T) {
 		},
 	}, meshviewer)
 
-	_, err = ReadConfigFile("testdata/config_invalid.toml")
+	err = ReadConfigFile("testdata/config_invalid.toml", config)
 	assert.Error(err, "not unmarshalable")
 	assert.Contains(err.Error(), "invalid TOML syntax")
 
-	_, err = ReadConfigFile("testdata/adsa.toml")
+	err = ReadConfigFile("testdata/adsa.toml", config)
 	assert.Error(err, "not found able")
 	assert.Contains(err.Error(), "no such file or directory")
 }

cmd/import.go

@@ -19,7 +19,10 @@ var importCmd = &cobra.Command{
 		path := args[0]
 		site := args[1]
 		domain := args[2]
-		config := loadConfig()
+		config := &ServeConfig{}
+		if err := ReadConfigFile(configPath, config); err != nil {
+			log.Panicf("unable to load config file: %s", err)
+		}
 
 		err := allDatabase.Start(config.Database)
 		if err != nil {

cmd/respondd.go

@@ -0,0 +1,40 @@
+package cmd
+
+import (
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/bdlm/log"
+	"github.com/spf13/cobra"
+
+	"github.com/FreifunkBremen/yanic/respond/daemon"
+)
+
+// serveCmd represents the serve command
+var responddCMD = &cobra.Command{
+	Use:     "respondd",
+	Short:   "Runs a respond daemon",
+	Example: "yanic respondd --config /etc/respondd.toml",
+	Run: func(cmd *cobra.Command, args []string) {
+		daemon := &respondd.Daemon{}
+		if err := ReadConfigFile(configPath, daemon); err != nil {
+			log.Panicf("unable to load config file: %s", err)
+		}
+
+		go daemon.Start()
+
+		log.Info("respondd daemon started")
+		// Wait for INT/TERM
+		sigs := make(chan os.Signal, 1)
+		signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
+		sig := <-sigs
+		log.Infof("received %s", sig)
+
+	},
+}
+
+func init() {
+	RootCmd.AddCommand(responddCMD)
+	responddCMD.Flags().StringVarP(&configPath, "config", "c", "config-respondd.toml", "Path to configuration file")
+}

cmd/serve.go

@@ -9,32 +9,42 @@ import (
 	"github.com/bdlm/log"
 	"github.com/spf13/cobra"
 
+	"github.com/FreifunkBremen/yanic/database"
 	allDatabase "github.com/FreifunkBremen/yanic/database/all"
 	allOutput "github.com/FreifunkBremen/yanic/output/all"
 	"github.com/FreifunkBremen/yanic/respond"
 	"github.com/FreifunkBremen/yanic/runtime"
 	"github.com/FreifunkBremen/yanic/webserver"
 )
 
+// ServeConfig represents the whole configuration
+type ServeConfig struct {
+	Respondd  respond.Config
+	Webserver webserver.Config
+	Nodes     runtime.NodesConfig
+	Database  database.Config
+}
+
 // serveCmd represents the serve command
 var serveCmd = &cobra.Command{
 	Use:     "serve",
 	Short:   "Runs the yanic server",
 	Example: "yanic serve --config /etc/yanic.toml",
 	Run: func(cmd *cobra.Command, args []string) {
-		config := loadConfig()
+		config := &ServeConfig{}
+		if err := ReadConfigFile(configPath, config); err != nil {
+			log.Panicf("unable to load config file: %s", err)
+		}
 
-		err := allDatabase.Start(config.Database)
-		if err != nil {
+		if err := allDatabase.Start(config.Database); err != nil {
 			log.Panicf("could not connect to database: %s", err)
 		}
 		defer allDatabase.Close()
 
 		nodes = runtime.NewNodes(&config.Nodes)
 		nodes.Start()
 
-		err = allOutput.Start(nodes, config.Nodes)
-		if err != nil {
+		if err := allOutput.Start(nodes, config.Nodes); err != nil {
 			log.Panicf("error on init outputs: %s", err)
 		}
 		defer allOutput.Close()

config-respondd_example.toml

@@ -0,0 +1,30 @@
+# how ofter the cache respond of a respondd request is calculated
+data_interval = "3m"
+
+batman = ["bat03", "bat04"]
+babel  = "[::1]:33123"
+
+[[listen]]
+address   = "ff02::2:1001"
+interface = "bat03"
+port      = 1001
+
+[defaults]
+node_id  = ""
+hostname = ""
+site_code = "ffhb"
+domain_code = ""
+vpn = false
+interface_mac = "eth0"
+interfaces_traffic = [ "eth0" ]
+interfaces_address = [ "br-ffhb", "eth0" ]
+
+[defaults.location]
+latitude  = 53.112446246
+longitude = 8.734087944
+
+# if divergent configuration of defaults are wanted by respond on interface/zones example with bat0
+[zones.bat03]
+node_id  = ""
+hostname = ""
+#...

contrib/init/linux-systemd/respondd.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=yanic's respondd
+
+[Service]
+Type=simple
+ExecStart=/opt/go/bin/yanic respondd --config /etc/respondd.conf
+Restart=always
+RestartSec=5s
+Environment=PATH=/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
+
+[Install]
+WantedBy=multi-user.target

data/response.go

@@ -2,8 +2,8 @@ package data
 
 // ResponseData struct
 type ResponseData struct {
-	Neighbours   *Neighbours            `json:"neighbours"`
-	Nodeinfo     *Nodeinfo              `json:"nodeinfo"`
-	Statistics   *Statistics            `json:"statistics"`
+	Nodeinfo     *Nodeinfo              `json:"nodeinfo" toml:"nodeinfo"`
+	Statistics   *Statistics            `json:"statistics" toml:"statistics"`
+	Neighbours   *Neighbours            `json:"neighbours" toml:"neighbours"`
 	CustomFields map[string]interface{} `json:"-"`
 }