chef-solr 0.8.10 → 0.8.14

data/VERSION

@@ -1 +1 @@
-0.8.10
+0.8.14

data/lib/chef/solr.rb

@@ -16,7 +16,6 @@
 # limitations under the License.
 #
 
-require 'rubygems'
 require 'chef/mixin/xml_escape'
 require 'chef/log'
 require 'chef/config'
@@ -35,7 +34,7 @@ require 'uri'
 class Chef
   class Solr
 
-    VERSION = "0.8.9"
+    VERSION = "0.8.14"
 
     include Chef::Mixin::XMLEscape
 

data/lib/chef/solr/application/solr.rb

@@ -114,25 +114,36 @@ class Chef
 
         def initialize
           super
-          Chef::Log.level = Chef::Config[:log_level]
         end
 
         def setup_application
-          Chef::Daemon.change_privilege
+          # Need to redirect stdout and stderr so Java process inherits them.
+          # If -L wasn't specified, Chef::Config[:log_location] will be an IO
+          # object, otherwise it will be a String.
+          #
+          # Open this as a privileged user and hang onto it
+          if Chef::Config[:log_location].kind_of?(String)
+            @logfile = File.new(Chef::Config[:log_location], "a")
+          end
+
+          Chef::Log.level = Chef::Config[:log_level]
 
           # Build up a client
-          c = Chef::Client.new
-          c.build_node(nil, true)
+          node = Chef::Node.new
+          node.platform = :default
+          node.platform_version = 42
+
+          Chef::Daemon.change_privilege
 
           solr_base = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..", "solr"))
 
           # Create the Jetty container
           unless File.directory?(Chef::Config[:solr_jetty_path])
             Chef::Log.warn("Initializing the Jetty container")
-            solr_jetty_dir = Chef::Resource::Directory.new(Chef::Config[:solr_jetty_path], nil, c.node)
+            solr_jetty_dir = Chef::Resource::Directory.new(Chef::Config[:solr_jetty_path], nil, node)
             solr_jetty_dir.recursive(true)
             solr_jetty_dir.run_action(:create)
-            solr_jetty_untar = Chef::Resource::Execute.new("untar_jetty", nil, c.node)
+            solr_jetty_untar = Chef::Resource::Execute.new("untar_jetty", nil, node)
             solr_jetty_untar.command("tar zxvf #{File.join(solr_base, 'solr-jetty.tar.gz')}")
             solr_jetty_untar.cwd(Chef::Config[:solr_jetty_path])
             solr_jetty_untar.run_action(:run)
@@ -141,10 +152,10 @@ class Chef
           # Create the solr home
           unless File.directory?(Chef::Config[:solr_home_path])
             Chef::Log.warn("Initializing Solr home directory")
-            solr_home_dir = Chef::Resource::Directory.new(Chef::Config[:solr_home_path], nil, c.node)
+            solr_home_dir = Chef::Resource::Directory.new(Chef::Config[:solr_home_path], nil, node)
             solr_home_dir.recursive(true)
             solr_home_dir.run_action(:create)
-            solr_jetty_untar = Chef::Resource::Execute.new("untar_solr_home", nil, c.node)
+            solr_jetty_untar = Chef::Resource::Execute.new("untar_solr_home", nil, node)
             solr_jetty_untar.command("tar zxvf #{File.join(solr_base, 'solr-home.tar.gz')}")
             solr_jetty_untar.cwd(Chef::Config[:solr_home_path])
             solr_jetty_untar.run_action(:run)
@@ -153,7 +164,7 @@ class Chef
           # Create the solr data path
           unless File.directory?(Chef::Config[:solr_data_path])
             Chef::Log.warn("Initializing Solr data directory")
-            solr_data_dir = Chef::Resource::Directory.new(Chef::Config[:solr_data_path], nil, c.node)
+            solr_data_dir = Chef::Resource::Directory.new(Chef::Config[:solr_data_path], nil, node)
             solr_data_dir.recursive(true)
             solr_data_dir.run_action(:create)
           end
@@ -164,15 +175,6 @@ class Chef
             Chef::Daemon.daemonize("chef-solr")
           end
 
-          # Need to redirect stdout and stderr so Java process inherits them.
-          # If -L wasn't specified, Chef::Config[:log_location] will be an IO
-          # object, otherwise it will be a String.
-          if Chef::Config[:log_location].kind_of?(String)
-            logfile = File.new(Chef::Config[:log_location], "w")
-            STDOUT.reopen(logfile)
-            STDERR.reopen(logfile)
-          end
-          
           Dir.chdir(Chef::Config[:solr_jetty_path]) do
             command = "java -Xmx#{Chef::Config[:solr_heap_size]} -Xms#{Chef::Config[:solr_heap_size]}"
             command << " -Dsolr.data.dir=#{Chef::Config[:solr_data_path]}"
@@ -180,6 +182,17 @@ class Chef
             command << " #{Chef::Config[:solr_java_opts]}" if Chef::Config[:solr_java_opts]
             command << " -jar #{File.join(Chef::Config[:solr_jetty_path], 'start.jar')}"
             Chef::Log.info("Starting Solr with #{command}")
+
+            # Opened earlier before we dropped privileges
+            if @logfile
+              # Don't need it anymore
+              Chef::Log.close
+
+              STDOUT.reopen(@logfile)
+              STDERR.reopen(@logfile)
+              @logfile.close
+            end
+
             Kernel.exec(command)
 
           end

data/lib/chef/solr/index_queue_consumer.rb

@@ -16,7 +16,6 @@
 # limitations under the License.
 #
 
-require 'rubygems'
 require 'chef/log'
 require 'chef/config'
 require 'chef/solr'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 10
-  version: 0.8.10
+  - 14
+  version: 0.8.14
 platform: ruby
 authors: 
 - Adam Jacob
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -07:00
+date: 2010-05-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libxml-ruby
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -35,6 +36,7 @@ dependencies:
   name: uuidtools
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -49,14 +51,15 @@ dependencies:
   name: chef
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 8
-        - 10
-        version: 0.8.10
+        - 14
+        version: 0.8.14
   type: :runtime
   version_requirements: *id003
 description: 
@@ -102,6 +105,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -109,6 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -118,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.6.1
 signing_key: 
 specification_version: 3
 summary: Search indexing for Chef