Merge branch 'weave-fix-unittest' of https://github.com/inercia/weave into inercia-weave-fix-unittest

This commit is contained in:
Bryan Boreham committed 2015-06-15 11:51:14 +01:00
commit f3ad8bd52f
7 files changed
+288 -141

No files matched your search

-3
View File
@@ -33,7 +33,6 @@ func main() {
udpbuf int
fallback string
refreshInterval int
refreshWorkers int
relevantTime int
maxAnswers int
cacheLen int
@@ -58,7 +57,6 @@ func main() {
// advanced options
flag.IntVar(&negTTL, "neg-ttl", weavedns.DefaultCacheNegLocalTTL, "negative TTL (in secs) for unanswered queries for local names")
flag.IntVar(&refreshInterval, "refresh", weavedns.DefaultRefreshInterval, "refresh interval (in secs) for local names (0=disable)")
flag.IntVar(&refreshWorkers, "refresh-workers", weavedns.DefaultNumUpdaters, "default number of background updaters")
flag.IntVar(&maxAnswers, "max-answers", weavedns.DefaultMaxAnswers, "maximum number of answers returned to clients (0=unlimited)")
flag.IntVar(&relevantTime, "relevant", weavedns.DefaultRelevantTime, "life time for info in the absence of queries (in secs)")
flag.IntVar(&udpbuf, "udpbuf", weavedns.DefaultUDPBuflen, "UDP buffer length")
@@ -122,7 +120,6 @@ func main() {
Iface: iface,
LocalTTL: ttl,
RefreshInterval: refreshInterval,
RefreshWorkers: refreshWorkers,
RelevantTime: relevantTime,
}
zone, err := weavedns.NewZoneDb(zoneConfig)