@@ -107,12 +107,12 @@ class ChefServerSlice::OpenidConsumer < ChefServerSlice::Application true end end - + def is_authorized_openid_identifier?(openid, authorized_identifiers) Chef::Log.debug("checking for valid openid identifier: openid: #{openid}, authorized openids: #{authorized_identifiers}") if authorized_identifiers and openid - if authorized_identifiers.length > 0 - authorized_identifiers.detect { |p| Chef::Log.debug("openid: #{openid} (#{openid.class}), p: #{p} (#{p.class})"); openid == p } + if authorized_identifiers.length > 0 + authorized_identifiers.detect { |p| Chef::Log.debug("openid: #{openid} (#{openid.class}), p: #{p} (#{p.class})"); openid == p } else true end chef-server-slice/app/controllers/openid_consumer.rb @@ -93,16 +93,23 @@ class Chef::Application::Indexer < Chef::Application Chef::Daemon.daemonize("chef-indexer") end + if Chef::Config[:queue_prefix] + queue_prefix = Chef::Config[:queue_prefix] + queue_partial_url = "/queue/#{queue_prefix}/chef" + else + queue_partial_url = "/queue/chef" + end + loop do object, headers = Chef::Queue.receive_msg Chef::Log.info("Headers #{headers.inspect}") - if headers["destination"] == "/queue/chef/index" || headers["destination"] == "/queue/#{queue_prefix}/chef/index" + if headers["destination"] == "#{queue_partial_url}/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" || headers["destination"] == "/queue/#{queue_prefix}/chef/remove" + elsif headers["destination"] == "#{queue_partial_url}/remove" start_timer = Time.new @chef_search_indexer.delete(object) @chef_search_indexer.commit chef/lib/chef/application/indexer.rb a51bb6abc385d3333ade0926756b3d9c50bcb71b zeusfaber joe@joetify.com http://github.com/joewilliams/chef/commit/8cc9d0b2f5a4dc3495bb35a8ebe8c0c88fd3a0ff 8cc9d0b2f5a4dc3495bb35a8ebe8c0c88fd3a0ff 2009-06-30T15:49:12-07:00 2009-06-30T15:49:12-07:00 fix for chef-indexer when prefix is nil 4a85cdaa626a695ba952f4766bf621cd8a254ea1 zeusfaber joe@joetify.com