WIP adopt updated yaml-config with 'fromdefaults' struct tag

daemon/connecter/connecter.go

@@ -6,7 +6,7 @@ import (
 	"github.com/zrepl/zrepl/config"
 )
 
-func FromConfig(g config.Global, in config.ConnectEnum) (streamrpc.Connecter, error) {
+func FromConfig(g *config.Global, in config.ConnectEnum) (streamrpc.Connecter, error) {
 	switch v := in.Ret.(type) {
 	case *config.SSHStdinserverConnect:
 		return SSHStdinserverConnecterFromConfig(v)

daemon/daemon.go

@@ -17,7 +17,7 @@ import (
 	"time"
 )
 
-func Run(conf config.Config) error {
+func Run(conf *config.Config) error {
 
 	ctx, cancel := context.WithCancel(context.Background())
 
@@ -29,7 +29,7 @@ func Run(conf config.Config) error {
 		cancel()
 	}()
 
-	outlets, err := logging.OutletsFromConfig(conf.Global.Logging)
+	outlets, err := logging.OutletsFromConfig(*conf.Global.Logging)
 	if err != nil {
 		return errors.Wrap(err, "cannot build logging from config")
 	}

daemon/job/build_jobs.go

@@ -6,7 +6,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-func JobsFromConfig(c config.Config) ([]Job, error) {
+func JobsFromConfig(c *config.Config) ([]Job, error) {
 	js := make([]Job, len(c.Jobs))
 	for i := range c.Jobs {
 		j, err := buildJob(c.Global, c.Jobs[i])
@@ -18,7 +18,7 @@ func JobsFromConfig(c config.Config) ([]Job, error) {
 	return js, nil
 }
 
-func buildJob(c config.Global, in config.JobEnum) (j Job, err error) {
+func buildJob(c *config.Global, in config.JobEnum) (j Job, err error) {
 	switch v := in.Ret.(type) {
 	case *config.SinkJob:
 		j, err = SinkFromConfig(c, v)

daemon/job/push.go

@@ -25,7 +25,7 @@ type Push struct {
 	replication *replication.Replication
 }
 
-func PushFromConfig(g config.Global, in *config.PushJob) (j *Push, err error) {
+func PushFromConfig(g *config.Global, in *config.PushJob) (j *Push, err error) {
 
 	j = &Push{}
 	j.name = in.Name

daemon/job/sink.go

@@ -19,7 +19,7 @@ type Sink struct {
 	fsmapInv endpoint.FSFilter
 }
 
-func SinkFromConfig(g config.Global, in *config.SinkJob) (s *Sink, err error) {
+func SinkFromConfig(g *config.Global, in *config.SinkJob) (s *Sink, err error) {
 
 	// FIXME multi client support
 

daemon/logging/build_logging.go

@@ -16,7 +16,7 @@ import (
 	"os"
 )
 
-func OutletsFromConfig(in []config.LoggingOutletEnum) (*logger.Outlets, error) {
+func OutletsFromConfig(in config.LoggingOutletEnumList) (*logger.Outlets, error) {
 
 	outlets := logger.NewOutlets()
 

daemon/serve/serve.go

@@ -10,7 +10,7 @@ type ListenerFactory interface {
 	Listen() (net.Listener, error)
 }
 
-func FromConfig(g config.Global, in config.ServeEnum) (ListenerFactory, error) {
+func FromConfig(g *config.Global, in config.ServeEnum) (ListenerFactory, error) {
 
 	switch v := in.Ret.(type) {
 	case *config.TCPServe:

daemon/serve/serve_stdinserver.go

@@ -15,7 +15,7 @@ type StdinserverListenerFactory struct {
 	sockpath       string
 }
 
-func StdinserverListenerFactoryFromConfig(g config.Global, in *config.StdinserverServer) (f *StdinserverListenerFactory, err error) {
+func StdinserverListenerFactoryFromConfig(g *config.Global, in *config.StdinserverServer) (f *StdinserverListenerFactory, err error) {
 
 	f = &StdinserverListenerFactory{
 		ClientIdentity: in.ClientIdentity,

daemon/serve/serve_tcp.go

@@ -9,7 +9,7 @@ type TCPListenerFactory struct {
 	Address string
 }
 
-func TCPListenerFactoryFromConfig(c config.Global, in *config.TCPServe) (*TCPListenerFactory, error) {
+func TCPListenerFactoryFromConfig(c *config.Global, in *config.TCPServe) (*TCPListenerFactory, error) {
 	lf := &TCPListenerFactory{
 		Address: in.Listen,
 	}

daemon/serve/serve_tls.go

@@ -18,7 +18,7 @@ type TLSListenerFactory struct {
 	handshakeTimeout time.Duration
 }
 
-func TLSListenerFactoryFromConfig(c config.Global, in *config.TLSServe) (lf *TLSListenerFactory, err error) {
+func TLSListenerFactoryFromConfig(c *config.Global, in *config.TLSServe) (lf *TLSListenerFactory, err error) {
 	lf = &TLSListenerFactory{
 		address: in.Listen,
 	}