Fixes #30731 - Make smart-proxy use SdNotify library

lib/launcher.rb

@@ -1,8 +1,8 @@
 require 'proxy/log'
-require 'proxy/sd_notify'
 require 'proxy/settings'
 require 'proxy/signal_handler'
 require 'proxy/log_buffer/trace_decorator'
+require 'sd_notify'
 
 CIPHERS = ['ECDHE-RSA-AES128-GCM-SHA256', 'ECDHE-RSA-AES256-GCM-SHA384',
            'AES128-GCM-SHA256', 'AES256-GCM-SHA384', 'AES128-SHA256',
@@ -212,7 +212,7 @@ def install_webrick_callback!(*apps)
 
     def launched(apps)
       logger.info("Smart proxy has launched on #{apps.size} socket(s), waiting for requests")
-      Proxy::SdNotify.new.tap { |sd| sd.ready if sd.active? }
+      SdNotify.ready
     end
   end
 end

smart_proxy.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'json'
   s.add_dependency 'logging'
   s.add_dependency 'rack', '>= 1.3'
+  s.add_dependency 'sd_notify', '~> 0.1'
   s.add_dependency 'sinatra'
   s.description = <<~EOF
     Foreman Proxy is used via The Foreman Project, it allows Foreman to manage

test/launcher_test.rb

@@ -52,19 +52,7 @@ def test_install_webrick_callback
 
   def test_launched_with_sdnotify
     @launcher.logger.expects(:info).with(includes('2 socket(s)'))
-    sd_notify = mock('SdNotify')
-    sd_notify.expects(:active?).returns(true)
-    sd_notify.expects(:ready)
-    Proxy::SdNotify.expects(:new).returns(sd_notify)
-    @launcher.launched([:app1, :app2])
-  end
-
-  def test_launched_with_sdnotify_inactive
-    @launcher.logger.expects(:info).with(includes('2 socket(s)'))
-    sd_notify = mock('SdNotify')
-    sd_notify.expects(:active?).returns(false)
-    sd_notify.expects(:ready).never
-    Proxy::SdNotify.expects(:new).returns(sd_notify)
+    ::SdNotify.expects(:ready)
     @launcher.launched([:app1, :app2])
   end
 end