Mirrors/birdwatcher
1
0
Fork 0
mirror of https://github.com/alice-lg/birdwatcher.git synced 2025-03-09 00:00:05 +01:00
Code Issues Releases Wiki Activity

Merge branch 'upstream/master' into develop

Browse source 
Merge changes including version 1.11.0 of upstream.
Conflicts:
        README.md
        * Keep `birdwatcher` in the configuration path
        VERSION
        * Keep version to 1.12.3 from development at DE-CIX
        bird/bird.go
        * Keep the default order of arguments to birdc in RoutesFiltered() and RoutesNoExport()
        birdwatcher.go
        * Keep `gorilla/handlers` for HTTP logging
This commit is contained in:
Benedikt Rudolph 2019-02-28 09:17:41 +01:00
commit b68401e0e5
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bird/bird.go
View file

@ -305,14 +305,6 @@ func RoutesNoExport(protocol string) (Parsed, bool) {
if ParserConf.PerPeerTables &&
strings.HasPrefix(protocol, ParserConf.PeerProtocolPrefix) {
protocolsRes, from_cache := ProtocolsBgp()
if IsSpecial(protocolsRes) {
return protocolsRes, from_cache
}
if _, ok := protocolsRes["protocols"].(Parsed)[protocol]; !ok {
return NilParse, false
}
// Replace prefix
protocol = ParserConf.PipeProtocolPrefix +
protocol[len(ParserConf.PeerProtocolPrefix):]

4
etc/birdwatcher/birdwatcher.conf
View file

@ -54,13 +54,13 @@ requests_per_minute = 10
[bird]
listen = "0.0.0.0:29188"
listen = "0.0.0.0:29184"
config = "/etc/bird.conf"
birdc = "/sbin/birdc"
ttl = 5 # time to live (in minutes) for caching of cli output
[bird6]
listen = "0.0.0.0:29189"
listen = "0.0.0.0:29186"
config = "/etc/bird6.conf"
birdc = "/sbin/birdc6"
ttl = 5 # time to live (in minutes) for caching of cli output