lib/riddle/0.9.9/configuration/searchd.rb in riddle-2.2.2 vs lib/riddle/0.9.9/configuration/searchd.rb in riddle-2.3.0
- old
+ new
@@ -21,10 +21,16 @@
@listen = []
@listen << @port.to_s if @port
@listen << "9306:mysql41" if @mysql41.is_a?(TrueClass)
@listen << "#{@mysql41}:mysql41" if @mysql41.is_a?(NUMBER)
- @listen = @listen.collect { |line| "#{@address}:#{line}" } if @address
+ if @listen.empty? && @address
+ @listen << @address
+ else
+ @listen = @listen.collect { |line| "#{@address}:#{line}" } if @address
+ end
+
+ @listen += Array(@socket) if @socket
end
def settings
@listen.nil? ? super : super - [:address, :port]
end