(choria-io#114) support expr filters and retire old filter logic

Signed-off-by: R.I.Pienaar <rip@devco.net>
ripienaar · Jan 10, 2021 · 9f266f0 · 9f266f0
1 parent 897f71c
commit 9f266f0
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 1,422 deletions.
diff --git a/lib/mcollective.rb b/lib/mcollective.rb
@@ -40,7 +40,6 @@ module MCollective
   require "mcollective/facts"
   require "mcollective/logger"
   require "mcollective/log"
-  require "mcollective/matcher"
   require "mcollective/message"
   require "mcollective/optionparser"
   require "mcollective/generators"

diff --git a/lib/mcollective/application/describe_filter.rb b/lib/mcollective/application/describe_filter.rb
diff --git a/lib/mcollective/discovery.rb b/lib/mcollective/discovery.rb
@@ -85,19 +85,18 @@ def force_discovery_method_by_filter(filter)
     def timeout_for_compound_filter(compound_filter)
       return 0 if compound_filter.nil? || compound_filter.empty?
 
-      timeout = 0
-
-      compound_filter.each do |filter|
-        filter.each do |statement|
-          next unless statement["fstatement"]
-
-          pluginname = Data.pluginname(statement["fstatement"]["name"])
-          ddl = DDL.new(pluginname, :data)
-          timeout += ddl.meta[:timeout]
-        end
-      end
-
-      timeout
+      # disabled while bringing in new compound filters
+      # compound_filter.each do |filter|
+      #   filter.each do |statement|
+      #     next unless statement["fstatement"]
+      #
+      #     pluginname = Data.pluginname(statement["fstatement"]["name"])
+      #     ddl = DDL.new(pluginname, :data)
+      #     timeout += ddl.meta[:timeout]
+      #   end
+      # end
+
+      0
     end
 
     def discovery_timeout(timeout, filter)

diff --git a/lib/mcollective/matcher.rb b/lib/mcollective/matcher.rb