mirror of
https://github.com/octoleo/syncthing.git
synced 2024-11-14 09:14:10 +00:00
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
97 lines
3.0 KiB
Go
97 lines
3.0 KiB
Go
// Package english provides utilities to generate more user-friendly English output.
|
|
package english
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
)
|
|
|
|
// These are included because they are common technical terms.
|
|
var specialPlurals = map[string]string{
|
|
"index": "indices",
|
|
"matrix": "matrices",
|
|
"vertex": "vertices",
|
|
}
|
|
|
|
var sibilantEndings = []string{"s", "sh", "tch", "x"}
|
|
|
|
var isVowel = map[byte]bool{
|
|
'A': true, 'E': true, 'I': true, 'O': true, 'U': true,
|
|
'a': true, 'e': true, 'i': true, 'o': true, 'u': true,
|
|
}
|
|
|
|
// PluralWord builds the plural form of an English word.
|
|
// The simple English rules of regular pluralization will be used
|
|
// if the plural form is an empty string (i.e. not explicitly given).
|
|
// The special cases are not guaranteed to work for strings outside ASCII.
|
|
func PluralWord(quantity int, singular, plural string) string {
|
|
if quantity == 1 {
|
|
return singular
|
|
}
|
|
if plural != "" {
|
|
return plural
|
|
}
|
|
if plural = specialPlurals[singular]; plural != "" {
|
|
return plural
|
|
}
|
|
|
|
// We need to guess what the English plural might be. Keep this
|
|
// function simple! It doesn't need to know about every possiblity;
|
|
// only regular rules and the most common special cases.
|
|
//
|
|
// Reference: http://en.wikipedia.org/wiki/English_plural
|
|
|
|
for _, ending := range sibilantEndings {
|
|
if strings.HasSuffix(singular, ending) {
|
|
return singular + "es"
|
|
}
|
|
}
|
|
l := len(singular)
|
|
if l >= 2 && singular[l-1] == 'o' && !isVowel[singular[l-2]] {
|
|
return singular + "es"
|
|
}
|
|
if l >= 2 && singular[l-1] == 'y' && !isVowel[singular[l-2]] {
|
|
return singular[:l-1] + "ies"
|
|
}
|
|
|
|
return singular + "s"
|
|
}
|
|
|
|
// Plural formats an integer and a string into a single pluralized string.
|
|
// The simple English rules of regular pluralization will be used
|
|
// if the plural form is an empty string (i.e. not explicitly given).
|
|
func Plural(quantity int, singular, plural string) string {
|
|
return fmt.Sprintf("%d %s", quantity, PluralWord(quantity, singular, plural))
|
|
}
|
|
|
|
// WordSeries converts a list of words into a word series in English.
|
|
// It returns a string containing all the given words separated by commas,
|
|
// the coordinating conjunction, and a serial comma, as appropriate.
|
|
func WordSeries(words []string, conjunction string) string {
|
|
switch len(words) {
|
|
case 0:
|
|
return ""
|
|
case 1:
|
|
return words[0]
|
|
default:
|
|
return fmt.Sprintf("%s %s %s", strings.Join(words[:len(words)-1], ", "), conjunction, words[len(words)-1])
|
|
}
|
|
}
|
|
|
|
// OxfordWordSeries converts a list of words into a word series in English,
|
|
// using an Oxford comma (https://en.wikipedia.org/wiki/Serial_comma). It
|
|
// returns a string containing all the given words separated by commas, the
|
|
// coordinating conjunction, and a serial comma, as appropriate.
|
|
func OxfordWordSeries(words []string, conjunction string) string {
|
|
switch len(words) {
|
|
case 0:
|
|
return ""
|
|
case 1:
|
|
return words[0]
|
|
case 2:
|
|
return strings.Join(words, fmt.Sprintf(" %s ", conjunction))
|
|
default:
|
|
return fmt.Sprintf("%s, %s %s", strings.Join(words[:len(words)-1], ", "), conjunction, words[len(words)-1])
|
|
}
|
|
}
|