flying-sphinx 0.6.2 → 0.6.3

data/HISTORY

@@ -1,3 +1,11 @@
+0.6.3 - 1st March 2012
+* Slow down polling for direct indexing from every 1 second to every 3 seconds.
+* Verbose logging now has timestamps.
+* Allow direct database access when FLYING_SPHINX_INGRESS is set.
+* Use dups of ENV variables so the values can be modified.
+* Report if Sphinx wasn't able to start.
+* Load Flying Sphinx when ENV['FLYING_SPHINX_IDENTIFIER'] exists, instead of for any Rails environment that isn't development or test.
+
 0.6.2 - 2nd January 2012
 * Pass Sphinx version through to Flying Sphinx servers.
 

data/lib/flying_sphinx/api.rb

@@ -66,13 +66,17 @@ class FlyingSphinx::API
 
   def log(method, path, data = {}, option = {}, &block)
     return block.call unless log?
-    
-    puts "API Request: #{method} '#{path}'; params: #{data.inspect}"
+
+    log_message "API Request: #{method} '#{path}'; params: #{data.inspect}"
     response = block.call
-    puts "API Response: #{response.body.inspect}"
+    log_message "API Response: #{response.body.inspect}"
     return response
   end
-  
+
+  def log_message(message)
+    puts "[#{Time.zone.now.to_s}] #{message}"
+  end
+
   def log?
     ENV['VERBOSE_LOGGING'] && ENV['VERBOSE_LOGGING'].length > 0
   end

data/lib/flying_sphinx/configuration.rb

@@ -37,11 +37,11 @@ class FlyingSphinx::Configuration
   end
 
   def start_sphinx
-    api.post('start')
+    api.post('start').status == 200
   end
 
   def stop_sphinx
-    api.post('stop')
+    api.post('stop').status == 200
   end
 
   def client_key
@@ -177,10 +177,10 @@ class FlyingSphinx::Configuration
   end
 
   def host_from_env
-    ENV['FLYING_SPHINX_HOST']
+    ENV['FLYING_SPHINX_HOST'].dup
   end
 
   def port_from_env
-    ENV['FLYING_SPHINX_PORT']
+    ENV['FLYING_SPHINX_PORT'].dup
   end
 end

data/lib/flying_sphinx/index_request.rb

@@ -108,7 +108,7 @@ class FlyingSphinx::IndexRequest
   def direct_index
     begin_request
     while !request_complete?
-      sleep 1
+      sleep 3
     end
   end
 

data/lib/flying_sphinx/rails.rb

@@ -1,9 +1,9 @@
 require 'action_controller/dispatcher'
 
-unless Rails.env.development? || Rails.env.test?
+if ENV['FLYING_SPHINX_IDENTIFIER']
   ActionController::Dispatcher.to_prepare :flying_sphinx do
     config = FlyingSphinx::Configuration.new
-  
+
     ThinkingSphinx::Configuration.instance.address = config.host
     ThinkingSphinx::Configuration.instance.port    = config.port
     ThinkingSphinx::Configuration.instance.configuration.searchd.client_key =

data/lib/flying_sphinx/railtie.rb

@@ -2,17 +2,17 @@ class FlyingSphinx::Railtie < Rails::Railtie
   rake_tasks do
     load File.expand_path('../tasks.rb', __FILE__)
   end
-  
+
   initializer "flying_sphinx.set_sphinx_host_and_port" do |app|
     config = FlyingSphinx::Configuration.new
-    
+
     ThinkingSphinx::Configuration.instance.address = config.host
     ThinkingSphinx::Configuration.instance.port    = config.port
     ThinkingSphinx::Configuration.instance.configuration.searchd.client_key =
       config.client_key
-    
+
     if ENV['DATABASE_URL'] && ENV['DATABASE_URL'][/^mysql/].nil?
       ThinkingSphinx.database_adapter = FlyingSphinx::HerokuSharedAdapter
     end
-  end unless Rails.env.development? || Rails.env.test?
+  end if ENV['FLYING_SPHINX_IDENTIFIER']
 end

data/lib/flying_sphinx/tasks.rb

@@ -5,28 +5,32 @@ namespace :fs do
     request = FlyingSphinx::IndexRequest.new
     request.update_and_index
     puts request.status_message
-    
+
   end
-  
+
   task :start => :environment do
     puts "Starting Sphinx..."
-    FlyingSphinx::Configuration.new.start_sphinx
-    puts "Started Sphinx"
+
+    if FlyingSphinx::Configuration.new.start_sphinx
+      puts "Started Sphinx"
+    else
+      puts "Sphinx failed to start... have you indexed first?"
+    end
   end
-  
+
   task :stop  => :environment do
     puts "Stopping Sphinx..."
     FlyingSphinx::Configuration.new.stop_sphinx
     puts "Stopped Sphinx"
   end
-  
+
   task :restart => [:environment, :stop, :start]
   task :rebuild => [:environment, :stop, :index, :start]
-  
+
   task :index_log => :environment do
     FlyingSphinx::IndexRequest.output_last_index
   end
-  
+
   task :actions => :environment do
     FlyingSphinx::Configuration.new.output_recent_actions
   end

data/lib/flying_sphinx/tunnel.rb

@@ -7,11 +7,12 @@ class FlyingSphinx::Tunnel
       end
     end
   end
-  
+
   def self.required?
+    ENV['FLYING_SPHINX_INGRESS'].blank? &&
     ThinkingSphinx.database_adapter == FlyingSphinx::HerokuSharedAdapter
   end
-  
+
   def initialize(configuration)
     @configuration = configuration
   end
@@ -23,13 +24,13 @@ class FlyingSphinx::Tunnel
     )
 
     session.loop { !remote_exists?(session) }
-    
+
     yield session
   rescue IOError
     # Server closed the connection on us. That's (hopefully) expected, nothing
     # to worry about.
   end
-  
+
   private
 
   def db_host

data/lib/flying_sphinx/version.rb

@@ -1,3 +1,3 @@
 module FlyingSphinx
-  Version = '0.6.2'
+  Version = '0.6.3'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flying-sphinx
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-02 00:00:00 +11:00
-default_executable: 
+date: 2012-02-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thinking-sphinx
-  prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,11 +28,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: riddle
   prerelease: false
+  name: thinking-sphinx
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,11 +44,11 @@ dependencies:
         - 5
         - 0
         version: 1.5.0
-  type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: net-ssh
   prerelease: false
+  name: riddle
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,11 +60,11 @@ dependencies:
         - 0
         - 23
         version: 2.0.23
-  type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
+  name: net-ssh
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,11 +76,11 @@ dependencies:
         - 0
         - 1
         version: 1.0.1
-  type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: faraday_middleware
   prerelease: false
+  name: multi_json
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -94,11 +92,11 @@ dependencies:
         - 7
         - 0
         version: 0.7.0
-  type: :runtime
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rash
   prerelease: false
+  name: faraday_middleware
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -110,11 +108,11 @@ dependencies:
         - 3
         - 0
         version: 0.3.0
-  type: :runtime
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
+  name: rash
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -126,11 +124,11 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  type: :development
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
+  name: rake
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -142,11 +140,11 @@ dependencies:
         - 8
         - 2
         version: 0.8.2
-  type: :development
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
+  name: yajl-ruby
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -158,11 +156,11 @@ dependencies:
         - 5
         - 0
         version: 2.5.0
-  type: :development
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
+  name: rspec
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -174,11 +172,11 @@ dependencies:
         - 9
         - 9
         version: 0.9.9
-  type: :development
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
+  name: rcov
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -190,11 +188,11 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  type: :development
   version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: fakeweb-matcher
   prerelease: false
+  name: fakeweb
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -206,11 +204,11 @@ dependencies:
         - 2
         - 2
         version: 1.2.2
-  type: :development
   version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: delayed_job
   prerelease: false
+  name: fakeweb-matcher
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -222,8 +220,9 @@ dependencies:
         - 1
         - 4
         version: 2.1.4
-  type: :development
   version_requirements: *id013
+  prerelease: false
+  name: delayed_job
 description: Hooks Thinking Sphinx into the Flying Sphinx service
 email: pat@freelancing-gods.com
 executables: []
@@ -261,7 +260,6 @@ files:
 - spec/specs/delayed_delta_spec.rb
 - spec/specs/flag_as_deleted_job_spec.rb
 - spec/specs/index_request_spec.rb
-has_rdoc: true
 homepage: https://flying-sphinx.com
 licenses: []
 
@@ -295,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Sphinx in the Cloud