@@ -116,10 +116,11 @@ module Capitate::Plugins::Utils # utils.hostname => "localhost.localdomain" # def hostname + hostname = nil run "hostname" do |channel, stream, data| - return data.chomp + hostname = data.chomp end - nil + hostname end # Append data to a file. lib/capitate/plugins/utils.rb @@ -32,8 +32,7 @@ namespace :sphinx do fetch_or_default(:sphinx_conf_root, "#{current_path}/config") fetch_or_default(:sphinx_index_root, "#{shared_path}/var/index") fetch_or_default(:sphinx_log_root, "#{shared_path}/log") - fetch_or_default(:sphinx_pid_path, "#{shared_path}/pids/searchd.pid") - fetch_or_default(:sphinx_hostname, Proc.new { utils.hostname }) # Runs if needed + fetch_or_default(:sphinx_pid_path, "#{shared_path}/pids/searchd.pid") fetch_or_set(:sphinx_db_user, :db_user) fetch_or_set(:sphinx_db_pass, :db_pass) @@ -42,7 +41,7 @@ namespace :sphinx do fetch_or_set(:sphinx_db_host, :db_host) fetch_or_default(:sphinx_conf_host, "127.0.0.1") - put template.load(sphinx_conf_template), sphinx_conf_path + put(template.load(sphinx_conf_template), sphinx_conf_path) end desc "Make symlink for sphinx conf" lib/recipes/sphinx.rb @@ -23,14 +23,14 @@ source pages sql_query_pre = SET NAMES UTF8 sql_query_pre = SET SESSION query_cache_type=OFF - sql_query_pre = INSERT INTO indexer_status (id, started_at, status, index_name, hostname) VALUES (10, NOW(), 'indexing', 'pages', '<%= sphinx_hostname %>') \ + sql_query_pre = INSERT INTO indexer_status (started_at, status, index_name, hostname) VALUES (NOW(), 'indexing', 'pages', USER()) \ ON DUPLICATE KEY UPDATE started_at = NOW(), status = 'indexing' sql_query = SELECT id, user_id, language, UNIX_TIMESTAMP(created_at) AS created_at, UNIX_TIMESTAMP(updated_at) AS updated_at, body, title FROM pages WHERE id>=$start AND id<=$end sql_query_range = SELECT MIN(id),MAX(id) FROM pages where type='Article' sql_range_step = 1000 - sql_query_post = UPDATE indexer_status SET updated_at = NOW(), status = 'updated' WHERE index_name = 'pages' and hostname = '<%= sphinx_hostname %>' + sql_query_post = UPDATE indexer_status SET updated_at = NOW(), status = 'updated' WHERE index_name = 'pages' and hostname = USER() sql_attr_uint = user_id sql_attr_timestamp = created_at @@ -43,15 +43,15 @@ source pages_delta : pages sql_query_pre = sql_query_pre = SET NAMES UTF8 sql_query_pre = SET SESSION query_cache_type=OFF - sql_query_pre = INSERT INTO indexer_status (id, started_at, status, index_name, hostname) VALUES (11, NOW(), 'indexing', 'pages_delta', '<%= sphinx_hostname %>') \ + sql_query_pre = INSERT INTO indexer_status (id, started_at, status, index_name, hostname) VALUES (NOW(), 'indexing', 'pages_delta', USER()) \ ON DUPLICATE KEY UPDATE started_at = NOW(), status = 'indexing' sql_query = SELECT id, user_id, language, UNIX_TIMESTAMP(created_at) AS created_at, UNIX_TIMESTAMP(updated_at) AS updated_at, body, title \ FROM pages \ - WHERE updated_at >= (SELECT updated_at FROM indexer_status WHERE id = 11) + WHERE updated_at >= (SELECT updated_at FROM indexer_status WHERE index_name = 'pages_delta' and hostname = USER()) sql_query_post = - sql_query_post = UPDATE indexer_status SET updated_at = NOW(), status = 'updated' WHERE index_name = 'pages_delta' and hostname = '<%= sphinx_hostname %>' + sql_query_post = UPDATE indexer_status SET updated_at = NOW(), status = 'updated' WHERE index_name = 'pages_delta' and hostname = USER() sql_query_range = sql_range_step = } lib/templates/sphinx/sphinx.conf.erb bf53988bde50c7da356fc151705d0497fdc400e0 Gabe gabrielh@gmail.com http://github.com/gabriel/capitate/commit/d7572bd50d1099e061bcbdec3d4d985c9acf434a d7572bd50d1099e061bcbdec3d4d985c9acf434a 2008-04-03T18:19:04-07:00 2008-04-03T18:19:04-07:00 hostname is a bad idea since its different per host (obiously, using USER() mysql function for sphinx delta index per host) b24c33d8ef86bb649f3cb3f1f0191202bd9f2730 Gabe gabrielh@gmail.com