Merge pull request #209 from uber/add_opt

Allow RequiresAppInPing to be configured

Author: yulunli

options.go

@@ -59,6 +59,10 @@ type configuration struct {
 
 	// SelfEvict holds the settings with regards to self eviction
 	SelfEvict swim.SelfEvictOptions
+
+	// RequiresAppInPing configures if ringpop node should reject pings
+	// that don't contain app name
+	RequiresAppInPing bool
 }
 
 // An Option is a modifier functions that configure/modify a real Ringpop
@@ -355,6 +359,15 @@ func SelfEvictPingRatio(ratio float64) Option {
 	}
 }
 
+// RequiresAppInPing configures if ringpop node should reject pings
+// that don't contain app name
+func RequiresAppInPing(requiresAppInPing bool) Option {
+	return func(r *Ringpop) error {
+		r.config.RequiresAppInPing = requiresAppInPing
+		return nil
+	}
+}
+
 // Default options
 
 // defaultClock sets the ringpop clock interface to use the system clock

ringpop.go

@@ -191,11 +191,12 @@ func (rp *Ringpop) init() error {
 	rp.registerHandlers()
 
 	rp.node = swim.NewNode(rp.config.App, address, rp.subChannel, &swim.Options{
-		StateTimeouts: rp.config.StateTimeouts,
-		Clock:         rp.clock,
-		LabelLimits:   rp.config.LabelLimits,
-		InitialLabels: rp.config.InitialLabels,
-		SelfEvict:     rp.config.SelfEvict,
+		StateTimeouts:     rp.config.StateTimeouts,
+		Clock:             rp.clock,
+		LabelLimits:       rp.config.LabelLimits,
+		InitialLabels:     rp.config.InitialLabels,
+		SelfEvict:         rp.config.SelfEvict,
+		RequiresAppInPing: rp.config.RequiresAppInPing,
 	})
 	rp.node.AddListener(rp)
 

ringpop_test.go

@@ -110,6 +110,7 @@ func (s *RingpopTestSuite) SetupTest() {
 		LabelLimitCount(1),
 		LabelLimitKeySize(5),
 		LabelLimitValueSize(5),
+		RequiresAppInPing(true),
 	)
 	s.NoError(err, "Ringpop must create successfully")