sanford 0.11.0 → 0.11.1

data/lib/sanford/process.rb

@@ -11,15 +11,18 @@ module Sanford
       options ||= {}
       @server = server
       @logger = @server.logger
-      @name = "sanford-#{@server.name}"
       @pid_file = PIDFile.new(@server.pid_file)
       @restart_cmd = RestartCmd.new
 
-      @server_ip = ignore_if_blank(ENV['SANFORD_IP'])
-      @server_port = ignore_if_blank(ENV['SANFORD_PORT']){ |v| v.to_i }
+      @server_ip = default_if_blank(ENV['SANFORD_IP'], @server.configured_ip)
+      @server_port = default_if_blank(
+        ENV['SANFORD_PORT'],
+        @server.configured_port
+      ){ |v| v.to_i }
       @server_fd = ignore_if_blank(ENV['SANFORD_SERVER_FD']){ |v| v.to_i }
       @listen_args = @server_fd ? [ @server_fd ] : [ @server_ip, @server_port ]
-      @listen_args.compact!
+
+      @name = "sanford-#{@server.name}-#{@server_ip}-#{@server_port}"
 
       @client_fds = (ENV['SANFORD_CLIENT_FDS'] || "").split(',').map(&:to_i)
 
@@ -71,9 +74,13 @@ module Sanford
       @restart_cmd.exec
     end
 
-    def ignore_if_blank(value, default = nil, &block)
+    def default_if_blank(value, default, &block)
+      ignore_if_blank(value, &block) || default
+    end
+
+    def ignore_if_blank(value, &block)
       block ||= proc{ |v| v }
-      value && !value.empty? ? block.call(value) : default
+      block.call(value) if value && !value.empty?
     end
 
   end

data/lib/sanford/server.rb

@@ -53,6 +53,14 @@ module Sanford
         @dat_tcp_server.client_file_descriptors
       end
 
+      def configured_ip
+        @server_data.ip
+      end
+
+      def configured_port
+        @server_data.port
+      end
+
       def pid_file
         @server_data.pid_file
       end

data/lib/sanford/version.rb

@@ -1,3 +1,3 @@
 module Sanford
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

data/test/unit/process_tests.rb

@@ -59,14 +59,16 @@ class Sanford::Process
     end
 
     should "know its name, pid file and restart cmd" do
-      assert_equal "sanford-#{@server_spy.name}", subject.name
+      expected = "sanford-#{@server_spy.name}-" \
+                 "#{@server_spy.configured_ip}-#{@server_spy.configured_port}"
+      assert_equal expected, subject.name
       assert_equal @pid_file_spy, subject.pid_file
       assert_equal @restart_cmd_spy, subject.restart_cmd
     end
 
     should "know its server ip, port and file descriptor" do
-      assert_nil subject.server_ip
-      assert_nil subject.server_port
+      assert_equal @server_spy.configured_ip, subject.server_ip
+      assert_equal @server_spy.configured_port, subject.server_port
       assert_nil subject.server_fd
     end
 
@@ -85,8 +87,8 @@ class Sanford::Process
       ENV['SANFORD_PORT'] = ''
       ENV['SANFORD_SERVER_FD'] = ''
       process = @process_class.new(@server_spy)
-      assert_nil process.server_ip
-      assert_nil process.server_port
+      assert_equal @server_spy.configured_ip, subject.server_ip
+      assert_equal @server_spy.configured_port, subject.server_port
       assert_nil process.server_fd
     end
 
@@ -173,7 +175,8 @@ class Sanford::Process
 
     should "have started the server listening" do
       assert_true @server_spy.listen_called
-      assert_equal [], @server_spy.listen_args
+      expected = [ subject.server_ip, subject.server_port ]
+      assert_equal expected, @server_spy.listen_args
     end
 
     should "have set the process name" do

data/test/unit/server_tests.rb

@@ -157,6 +157,8 @@ module Sanford::Server
     should have_readers :server_data, :dat_tcp_server
     should have_imeths :name, :ip, :port
     should have_imeths :file_descriptor, :client_file_descriptors
+    should have_imeths :configured_ip, :configured_port
+    should have_imeths :pid_file, :logger
     should have_imeths :listen, :start, :pause, :stop, :halt
     should have_imeths :paused?
 
@@ -186,6 +188,8 @@ module Sanford::Server
 
     should "know its name, pid file and logger" do
       assert_equal subject.server_data.name, subject.name
+      assert_equal subject.server_data.ip, subject.configured_ip
+      assert_equal subject.server_data.port, subject.configured_port
       assert_equal subject.server_data.pid_file, subject.pid_file
       assert_equal subject.server_data.logger, subject.logger
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sanford
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 11
-  - 0
-  version: 0.11.0
+  - 1
+  version: 0.11.1
 platform: ruby
 authors: 
 - Collin Redding