lib/riddle/0.9.9/configuration/searchd.rb in riddle-1.5.10 vs lib/riddle/0.9.9/configuration/searchd.rb in riddle-1.5.11

@@ -1,11 +1,10 @@
 module Riddle
   class Configuration
     class Searchd
       def valid?
         set_listen
-        clear_deprecated
 
         !( @listen.nil? || @listen.empty? || @pid_file.nil? )
       end
 
       private
@@ -21,14 +20,11 @@
         @listen << "#{@mysql41}:mysql41" if @mysql41.is_a?(Fixnum)
 
         @listen.each { |l| l.insert(0, "#{@address}:") } if @address
       end
 
-      def clear_deprecated
-        return if @listen.nil?
-
-        @address  = nil
-        @port     = nil
+      def settings
+        @listen.nil? ? super : super - [:address, :port]
       end
     end
   end
 end