@@ -6,9 +6,9 @@ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,14 +25,14 @@ require 'chef/log' class Chef::Application::Indexer < Chef::Application - - option :config_file, + + option :config_file, :short => "-c CONFIG", :long => "--config CONFIG", :default => "/etc/chef/server.rb", :description => "The configuration file to use" - option :log_level, + option :log_level, :short => "-l LEVEL", :long => "--log_level LEVEL", :description => "Set the log level (debug, info, warn, error, fatal)", @@ -52,7 +52,7 @@ class Chef::Application::Indexer < Chef::Application :boolean => true, :show_options => true, :exit => 0 - + option :user, :short => "-u USER", :long => "--user USER", @@ -76,7 +76,7 @@ class Chef::Application::Indexer < Chef::Application @chef_search_indexer = nil end - + # Create a new search indexer and connect to the stomp queues def setup_application Chef::Daemon.change_privilege @@ -86,7 +86,7 @@ class Chef::Application::Indexer < Chef::Application Chef::Queue.subscribe(:queue, "index") Chef::Queue.subscribe(:queue, "remove") end - + # Run the indexer, optionally daemonizing. def run_application if Chef::Config[:daemonize] @@ -96,13 +96,13 @@ class Chef::Application::Indexer < Chef::Application loop do object, headers = Chef::Queue.receive_msg Chef::Log.info("Headers #{headers.inspect}") - if headers["destination"] == "/queue/chef/index" + if headers["destination"] == "/queue/chef/index" || headers["destination"] == "/queue/#{queue_prefix}/chef/index" start_timer = Time.new @chef_search_indexer.add(object) @chef_search_indexer.commit final_timer = Time.new Chef::Log.info("Indexed object from #{headers['destination']} in #{final_timer - start_timer} seconds") - elsif headers["destination"] == "/queue/chef/remove" + elsif headers["destination"] == "/queue/chef/remove" || headers["destination"] == "/queue/#{queue_prefix}/chef/remove" start_timer = Time.new @chef_search_indexer.delete(object) @chef_search_indexer.commit chef/lib/chef/application/indexer.rb @@ -21,7 +21,7 @@ require 'mixlib/config' class Chef class Config - + extend Mixlib::Config # Manages the chef secret session key @@ -40,7 +40,7 @@ class Chef end newkey end - + # Override the config dispatch to set the value of log_location configuration option # # === Parameters @@ -49,7 +49,7 @@ class Chef def self.log_location=(location) configure { |c| c[:log_location] = (location.respond_to?(:sync=) ? location : File.new(location, "w+")) } end - + # Override the config dispatch to set the value of authorized_openid_providers when openid_providers (deprecated) is used # # === Parameters @@ -58,7 +58,7 @@ class Chef def self.openid_providers=(providers) configure { |c| c[:authorized_openid_provders] = providers } end - + authorized_openid_identifiers nil authorized_openid_providers nil cookbook_path [ "/var/chef/site-cookbooks", "/var/chef/cookbooks" ] @@ -73,7 +73,7 @@ class Chef group nil http_retry_count 5 http_retry_delay 5 - interval nil + interval nil json_attribs nil log_level :info log_location STDOUT @@ -92,6 +92,7 @@ class Chef queue_retry_count 5 queue_retry_delay 5 queue_user "" + queue_prefix nil registration_url "http://localhost:4000" remotefile_url "http://localhost:4000" rest_timeout 60 chef/lib/chef/config.rb @@ -6,9 +6,9 @@ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,17 +22,17 @@ require 'stomp' class Chef class Queue - + @client = nil @queue_retry_delay = Chef::Config[:queue_retry_delay] @queue_retry_count = Chef::Config[:queue_retry_count] - + class << self include Chef::Mixin::ParamsValidate - + def connect queue_user = Chef::Config[:queue_user] - queue_password = Chef::Config[:queue_password] + queue_password = Chef::Config[:queue_password] queue_host = Chef::Config[:queue_host] queue_port = Chef::Config[:queue_port] queue_retries = 1 unless queue_retries @@ -69,7 +69,13 @@ class Chef } } ) - queue_url = "/#{type}/chef/#{name}" + if Chef::Config[:queue_prefix] + queue_prefix = Chef::Config[:queue_prefix] + queue_url = "/#{type}/#{queue_prefix}/chef/#{name}" + else + queue_url = "/#{type}/chef/#{name}" + end + queue_url end def subscribe(type, name) @@ -119,7 +125,7 @@ class Chef msg = JSON.parse(raw_msg.body) return msg, raw_msg.headers end - + def poll_msg connect if @client == nil raw_msg = @client.poll() chef/lib/chef/queue.rb 822057fd25a03f252cd761324379340d082e9d58 zeusfaber joe@joetify.com http://github.com/joewilliams/chef/commit/a51bb6abc385d3333ade0926756b3d9c50bcb71b a51bb6abc385d3333ade0926756b3d9c50bcb71b 2009-06-26T10:39:22-07:00 2009-06-26T10:39:22-07:00 added code for multiple queues 08baed6164bd2feaef5c7a52d877c71f9d0b913f zeusfaber joe@joetify.com