Matcher refactor #543
Matcher refactor #543
Conversation
| @@ -30,26 +26,22 @@ func (c *ClientMock) Do(req *http.Request) (*http.Response, error) { | |||
| // move to subpackage and change to Interface | |||
| type Matcher interface { | |||
| IsMatch(*wrp.Message) bool | |||
|
|
|||
There was a problem hiding this comment.
removed getUrls from Mathcer interface since the urls field has been moved to sink.go
| } | ||
|
|
||
| type MatcherV1 struct { | ||
| events []*regexp.Regexp | ||
| matcher []*regexp.Regexp | ||
| urls *ring.Ring |
There was a problem hiding this comment.
moved urls to sink.go (webhookV1)
There was a problem hiding this comment.
any functionality related to urls that was in matcher.go has also been moved to sink.go
| type CommonWebhook struct { | ||
| mutex sync.RWMutex | ||
|
|
||
| type CommonMatcher struct { |
There was a problem hiding this comment.
Created a common matcher struct - not sure if it's all that necessary though
| @@ -27,84 +30,141 @@ import ( | |||
| ) | |||
|
|
|||
| type Sink interface { | |||
| Update(ancla.Register) error | |||
There was a problem hiding this comment.
still have the update function - but the signature has been updated and is no longer required for the Sink interface
| //TODO: need to determine best way to add client and client middleware to WebhooV1 | ||
| // client http.Client | ||
| // clientMiddleware func(http.Client) http.Client | ||
| } | ||
|
|
||
| type Webhooks []*WebhookV1 |
There was a problem hiding this comment.
going to use this webhookV1 struct (will be renaming this so as not to be confused with the webhookV1 schema) as the struct for the newest webhook struct in webhook schema for now - might have to add a third struct to satisfy all registrations
| type Kafkas []*Kafka | ||
| type Kafka struct { | ||
| id string |
There was a problem hiding this comment.
id and logger are both in comonwebhook struct
| } | ||
|
|
There was a problem hiding this comment.
all of this has been move to the kafka.Update function
| return nil | ||
| } | ||
|
|
||
| func (v1 *WebhookV1) updateUrls(urlCount int, url string, urls []string) { |
There was a problem hiding this comment.
moved over this functionality from mathcer.go
| @@ -420,7 +418,6 @@ Loop: | |||
| } | |||
| s.queueDepthGauge.Add(-1.0) | |||
| s.mutex.RLock() | |||
| urls = s.matcher.getUrls() | |||
There was a problem hiding this comment.
urls is now added to the sink structs and we will be referencing them directly from the struck rather than sending them to the send function
What's Included:
-Refactored the Matcher functionality so that it was only checking the matcher field for v2 and the matcher and events fields for v1
-Moved the urls functionality out of Matcher into Sink
Future TODO: renaming the Sink structs so as not to get confused with the webhook-schema structs