Merge pull request #1063 from LaurenceLiZhixin/Ftr/selfDiscovery

fix: fix bugs caused by 1.5

cluster/router/local/factory.go

@@ -38,6 +38,6 @@ func newLocalPriorityRouteFactory() router.PriorityRouterFactory {
 }
 
 // NewPriorityRouter construct a new NewLocalDiscRouter via url
-func (f *LocalPriorityRouteFactory) NewPriorityRouter(url *common.URL) (router.PriorityRouter, error) {
+func (f *LocalPriorityRouteFactory) NewPriorityRouter(url *common.URL, notify chan struct{}) (router.PriorityRouter, error) {
 	return NewLocalPriorityRouter(url)
 }

config/graceful_shutdown_config_test.go

@@ -32,8 +32,8 @@ func TestShutdownConfigGetTimeout(t *testing.T) {
 	assert.False(t, config.RequestsFinished)
 
 	config = ShutdownConfig{
-		Timeout:     "12x",
-		StepTimeout: "34a",
+		Timeout:     "60s",
+		StepTimeout: "10s",
 	}
 
 	assert.Equal(t, 60*time.Second, config.GetTimeout())