summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>2016-06-07 02:06:00 +0000
committerISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>2016-06-10 01:47:10 +0000
commitd218ff032a590a7bbb493b97996e9d02fd5c2d57 (patch)
tree622b40af1ac45368db1207126ae50a8d0cc22378
parent50bf0d34d31c8f745e58b0f172c86fb617b92bf8 (diff)
server: remove restart() from watcher interface
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>
-rw-r--r--server/bmp.go4
-rw-r--r--server/collector.go4
-rw-r--r--server/monitor.go4
-rw-r--r--server/watcher.go1
-rw-r--r--server/zclient.go4
5 files changed, 0 insertions, 17 deletions
diff --git a/server/bmp.go b/server/bmp.go
index 33e0b745..4542ef2d 100644
--- a/server/bmp.go
+++ b/server/bmp.go
@@ -227,10 +227,6 @@ func (w *bmpWatcher) loop() error {
}
}
-func (w *bmpWatcher) restart(string) error {
- return nil
-}
-
func bmpPeerUp(laddr string, lport, rport uint16, sent, recv *bgp.BGPMessage, t uint8, policy bool, pd uint64, peeri *table.PeerInfo, timestamp int64) *bmp.BMPMessage {
ph := bmp.NewBMPPeerHeader(t, policy, pd, peeri.Address.String(), peeri.AS, peeri.ID.String(), float64(timestamp))
return bmp.NewBMPPeerUpNotification(*ph, laddr, lport, rport, sent, recv)
diff --git a/server/collector.go b/server/collector.go
index 1399f338..2c0a47da 100644
--- a/server/collector.go
+++ b/server/collector.go
@@ -50,10 +50,6 @@ func (c *Collector) notify(t watcherEventType) chan watcherEvent {
func (c *Collector) stop() {
}
-func (c *Collector) restart(filename string) error {
- return nil
-}
-
func (c *Collector) watchingEventTypes() []watcherEventType {
return []watcherEventType{WATCHER_EVENT_UPDATE_MSG, WATCHER_EVENT_STATE_CHANGE, WATCHER_EVENT_ADJ_IN}
}
diff --git a/server/monitor.go b/server/monitor.go
index 35c14eca..a265629d 100644
--- a/server/monitor.go
+++ b/server/monitor.go
@@ -186,10 +186,6 @@ func (w *grpcWatcher) loop() error {
}
}
-func (w *grpcWatcher) restart(string) error {
- return nil
-}
-
func (w *grpcWatcher) addRequest(req *GrpcRequest) error {
w.ctlCh <- req
return nil
diff --git a/server/watcher.go b/server/watcher.go
index 87039479..674206d9 100644
--- a/server/watcher.go
+++ b/server/watcher.go
@@ -93,7 +93,6 @@ type watcherEventBestPathMsg struct {
type watcher interface {
notify(watcherEventType) chan watcherEvent
- restart(string) error
stop()
watchingEventTypes() []watcherEventType
}
diff --git a/server/zclient.go b/server/zclient.go
index 6da629c3..52c7aada 100644
--- a/server/zclient.go
+++ b/server/zclient.go
@@ -184,10 +184,6 @@ func (w *zebraWatcher) stop() {
w.t.Kill(nil)
}
-func (w *zebraWatcher) restart(filename string) error {
- return nil
-}
-
func (w *zebraWatcher) watchingEventTypes() []watcherEventType {
return []watcherEventType{WATCHER_EVENT_BESTPATH_CHANGE}
}