916ec63af6
This is a new revision of the discovery server. Relevant changes and non-changes: - Protocol towards clients is unchanged. - Recommended large scale design is still to be deployed nehind nginx (I tested, and it's still a lot faster at terminating TLS). - Database backend is leveldb again, only. It scales enough, is easy to setup, and we don't need any backend to take care of. - Server supports replication. This is a simple TCP channel - protect it with a firewall when deploying over the internet. (We deploy this within the same datacenter, and with firewall.) Any incoming client announces are sent over the replication channel(s) to other peer discosrvs. Incoming replication changes are applied to the database as if they came from clients, but without the TLS/certificate overhead. - Metrics are exposed using the prometheus library, when enabled. - The database values and replication protocol is protobuf, because JSON was quite CPU intensive when I tried that and benchmarked it. - The "Retry-After" value for failed lookups gets slowly increased from a default of 120 seconds, by 5 seconds for each failed lookup, independently by each discosrv. This lowers the query load over time for clients that are never seen. The Retry-After maxes out at 3600 after a couple of weeks of this increase. The number of failed lookups is stored in the database, now and then (avoiding making each lookup a database put). All in all this means clients can be pointed towards a cluster using just multiple A / AAAA records to gain both load sharing and redundancy (if one is down, clients will talk to the remaining ones). GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4648
114 lines
2.8 KiB
Go
114 lines
2.8 KiB
Go
// Disabling building of toml support in cases where golang is 1.0 or 1.1
|
|
// as the encoding library is not implemented or supported.
|
|
|
|
// +build go1.2
|
|
|
|
package altsrc
|
|
|
|
import (
|
|
"fmt"
|
|
"reflect"
|
|
|
|
"github.com/BurntSushi/toml"
|
|
"gopkg.in/urfave/cli.v1"
|
|
)
|
|
|
|
type tomlMap struct {
|
|
Map map[interface{}]interface{}
|
|
}
|
|
|
|
func unmarshalMap(i interface{}) (ret map[interface{}]interface{}, err error) {
|
|
ret = make(map[interface{}]interface{})
|
|
m := i.(map[string]interface{})
|
|
for key, val := range m {
|
|
v := reflect.ValueOf(val)
|
|
switch v.Kind() {
|
|
case reflect.Bool:
|
|
ret[key] = val.(bool)
|
|
case reflect.String:
|
|
ret[key] = val.(string)
|
|
case reflect.Int:
|
|
ret[key] = int(val.(int))
|
|
case reflect.Int8:
|
|
ret[key] = int(val.(int8))
|
|
case reflect.Int16:
|
|
ret[key] = int(val.(int16))
|
|
case reflect.Int32:
|
|
ret[key] = int(val.(int32))
|
|
case reflect.Int64:
|
|
ret[key] = int(val.(int64))
|
|
case reflect.Uint:
|
|
ret[key] = int(val.(uint))
|
|
case reflect.Uint8:
|
|
ret[key] = int(val.(uint8))
|
|
case reflect.Uint16:
|
|
ret[key] = int(val.(uint16))
|
|
case reflect.Uint32:
|
|
ret[key] = int(val.(uint32))
|
|
case reflect.Uint64:
|
|
ret[key] = int(val.(uint64))
|
|
case reflect.Float32:
|
|
ret[key] = float64(val.(float32))
|
|
case reflect.Float64:
|
|
ret[key] = float64(val.(float64))
|
|
case reflect.Map:
|
|
if tmp, err := unmarshalMap(val); err == nil {
|
|
ret[key] = tmp
|
|
} else {
|
|
return nil, err
|
|
}
|
|
case reflect.Array, reflect.Slice:
|
|
ret[key] = val.([]interface{})
|
|
default:
|
|
return nil, fmt.Errorf("Unsupported: type = %#v", v.Kind())
|
|
}
|
|
}
|
|
return ret, nil
|
|
}
|
|
|
|
func (self *tomlMap) UnmarshalTOML(i interface{}) error {
|
|
if tmp, err := unmarshalMap(i); err == nil {
|
|
self.Map = tmp
|
|
} else {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
type tomlSourceContext struct {
|
|
FilePath string
|
|
}
|
|
|
|
// NewTomlSourceFromFile creates a new TOML InputSourceContext from a filepath.
|
|
func NewTomlSourceFromFile(file string) (InputSourceContext, error) {
|
|
tsc := &tomlSourceContext{FilePath: file}
|
|
var results tomlMap = tomlMap{}
|
|
if err := readCommandToml(tsc.FilePath, &results); err != nil {
|
|
return nil, fmt.Errorf("Unable to load TOML file '%s': inner error: \n'%v'", tsc.FilePath, err.Error())
|
|
}
|
|
return &MapInputSource{valueMap: results.Map}, nil
|
|
}
|
|
|
|
// NewTomlSourceFromFlagFunc creates a new TOML InputSourceContext from a provided flag name and source context.
|
|
func NewTomlSourceFromFlagFunc(flagFileName string) func(context *cli.Context) (InputSourceContext, error) {
|
|
return func(context *cli.Context) (InputSourceContext, error) {
|
|
filePath := context.String(flagFileName)
|
|
return NewTomlSourceFromFile(filePath)
|
|
}
|
|
}
|
|
|
|
func readCommandToml(filePath string, container interface{}) (err error) {
|
|
b, err := loadDataFrom(filePath)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
err = toml.Unmarshal(b, container)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
err = nil
|
|
return
|
|
}
|