aboutsummaryrefslogtreecommitdiff
path: root/weed/server/filer_grpc_server_sub_meta.go
diff options
context:
space:
mode:
Diffstat (limited to 'weed/server/filer_grpc_server_sub_meta.go')
-rw-r--r--weed/server/filer_grpc_server_sub_meta.go25
1 files changed, 19 insertions, 6 deletions
diff --git a/weed/server/filer_grpc_server_sub_meta.go b/weed/server/filer_grpc_server_sub_meta.go
index 3fdac1b26..a900275b9 100644
--- a/weed/server/filer_grpc_server_sub_meta.go
+++ b/weed/server/filer_grpc_server_sub_meta.go
@@ -201,14 +201,18 @@ func (fs *FilerServer) eachEventNotificationFn(req *filer_pb.SubscribeMetadataRe
return nil
}
- if !strings.HasPrefix(fullpath, req.PathPrefix) {
- if eventNotification.NewParentPath != "" {
- newFullPath := util.Join(eventNotification.NewParentPath, entryName)
- if !strings.HasPrefix(newFullPath, req.PathPrefix) {
+ if hasPrefixIn(fullpath, req.PathPrefixes) {
+ // good
+ } else {
+ if !strings.HasPrefix(fullpath, req.PathPrefix) {
+ if eventNotification.NewParentPath != "" {
+ newFullPath := util.Join(eventNotification.NewParentPath, entryName)
+ if !strings.HasPrefix(newFullPath, req.PathPrefix) {
+ return nil
+ }
+ } else {
return nil
}
- } else {
- return nil
}
}
@@ -227,6 +231,15 @@ func (fs *FilerServer) eachEventNotificationFn(req *filer_pb.SubscribeMetadataRe
}
}
+func hasPrefixIn(text string, prefixes []string) bool {
+ for _, p := range prefixes {
+ if strings.HasPrefix(text, p) {
+ return true
+ }
+ }
+ return false
+}
+
func (fs *FilerServer) addClient(clientType string, clientAddress string) (clientName string) {
clientName = clientType + "@" + clientAddress
glog.V(0).Infof("+ listener %v", clientName)