From e037507b0e1bd926b1f253ae9abced4ca93f0738 Mon Sep 17 00:00:00 2001
From: "Matt K. Fu" <matt@rulingcom.com>
Date: Wed, 19 Jun 2013 19:23:45 +0800
Subject: [PATCH] fix solr setting

---
 config/solr.god    | 8 ++++----
 config/sunspot.yml | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/config/solr.god b/config/solr.god
index dbb4806ba..10bb2e33f 100644
--- a/config/solr.god
+++ b/config/solr.god
@@ -10,12 +10,12 @@ development_gid = ''
     w.group   = 'rulingcom'
     w.interval = 30.seconds
     w.env       = {"RAILS_ENV"=>rails_env}
-    w.start     = "HOME=#{user_home}  RAILS_ENV=#{rails_env} rake -f #{rails_root}/Rakefile sunspot:solr:start"
-
+    w.start     = "HOME=#{user_home} QUEUE=* RAILS_ENV=#{rails_env} rake -f #{rails_root}/Rakefile sunspot:solr:start"
+    w.keepalive
     w.uid = (rails_env == 'production' )? "root" : development_uid
     w.gid = (rails_env == 'production' )? "root" : development_gid
-  
-     w.log = (rails_env == 'production' )? "/var/log/#{w.group}/#{w.name}.log":"#{rails_root}/log/dev-#{w.name}.log"
+    w.pid_file = "#{rails_root}/solr/pids/production/sunspot-solr-production.pid"
+    w.log = (rails_env == 'production' )? "/var/log/#{w.group}/#{w.name}.log":"#{rails_root}/log/dev-#{w.name}.log"
 
     # restart if memory gets too high
     w.transition(:up, :restart) do |on|
diff --git a/config/sunspot.yml b/config/sunspot.yml
index e8323e423..94c95bc35 100644
--- a/config/sunspot.yml
+++ b/config/sunspot.yml
@@ -2,6 +2,7 @@ production:
   solr:
     hostname: localhost
     port: 8982
+    path: '/solr/orbit' #solr dic
     log_level: WARNING
 
 development: