Changeset 296

Timestamp:

12/16/07 21:00:13 (10 months ago)

Author:

jk

Message:

applied patch from #176 to allow for DRb over unix sockets. use socket option in ferret_server.yml

Files:

• trunk/plugin/acts_as_ferret/config/ferret_server.yml (modified) (1 diff)
• trunk/plugin/acts_as_ferret/lib/ferret_server.rb (modified) (2 diffs)

trunk/plugin/acts_as_ferret/config/ferret_server.yml

@@ -2 +2 @@
-# host: where to reach the DRb server (used by application processes to contact the server)
-# port: which port the server should listen on
+# socket: where the DRb server should create the socket (absolute path), this setting overrides host:port configuration
-# pid_file: location of the server's pid file (relative to RAILS_ROOT)
-# log_file: log file (default: RAILS_ROOT/log/ferret_server.log

trunk/plugin/acts_as_ferret/lib/ferret_server.rb

@@ -19 +19 @@
-        'log_file'  => "#{RAILS_ROOT}/log/ferret_server.log",
-        'log_level' => 'debug',
+        'socket'    => nil,
-      }
-
@@ -27 +28 @@
-        raise "malformed ferret server config" unless @everything.is_a?(Hash)
-        @config = DEFAULTS.merge(@everything[RAILS_ENV] || {})
-
+
+
+
-      end
-