smart_proxy_dynflow_core 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e605170d98b043dbebe0199fa07878a479c49517398b76b9ea8763b3f11a944
-  data.tar.gz: 3ca809db6838f8922b523c05b9009f7c06f6f3b7b225f708c0250dab92ee42e5
+  metadata.gz: 84ea792e8e6d9f6ddcd145428485d5faadf92da27acd184fa42956fa4873e7fd
+  data.tar.gz: 07adc8b3c623462086d0797455afaf822e27212bcdcda345a950df7e49296814
 SHA512:
-  metadata.gz: 83e7a7cefc7149bbdd9ea1fe75e10abcf3b3264aff1831e64aa87ac9e136404e35c5caf18d376e40be6d7ea845815f30aaa7a3a654d25236d437d7db84472f95
-  data.tar.gz: f748d215cca4ddf825b5f692568f162afdaf16aa394efb776df551365eaf1a09a925f9698a30f16e68c249865976a3aa8115ce5149e845403d1a7598f5de6380
+  metadata.gz: 989f9619b041039a3897de03cac1edc5ce1415a19792b3a5b2e907b174b97472b3a56f19cd5cab9977c26e5d5c83c38636afe8c49186dbd2bfce1c7e3dbfcc84
+  data.tar.gz: 7caa3ee4ddce3560970bd8f7a7b8e2b99dd96f1fae456e78475673ec98478e0c608e5feb29442b7046e4eed07e61f0d9a009dade6646e534f6ef6f033192f572

data/deploy/smart_proxy_dynflow_core.service

@@ -4,10 +4,9 @@ Documentation=https://github.com/theforeman/smart_proxy_dynflow
 After=network.target remote-fs.target nss-lookup.target
 
 [Service]
-Type=forking
+Type=notify
 User=foreman-proxy
-PIDFile=/var/run/foreman-proxy/smart_proxy_dynflow_core.pid
-ExecStart=/usr/bin/smart_proxy_dynflow_core -d -p /var/run/foreman-proxy/smart_proxy_dynflow_core.pid
+ExecStart=/usr/bin/smart_proxy_dynflow_core --no-daemonize
 EnvironmentFile=-/etc/sysconfig/smart_proxy_dynflow_core
 
 [Install]

data/lib/smart_proxy_dynflow_core/launcher.rb

@@ -1,6 +1,7 @@
 require 'webrick/https'
 require 'smart_proxy_dynflow_core/bundler_helper'
 require 'smart_proxy_dynflow_core/settings'
+require 'smart_proxy_dynflow_core/sd_notify'
 
 module SmartProxyDynflowCore
   class Launcher
@@ -18,6 +19,7 @@ module SmartProxyDynflowCore
       install_usr1_trap
       Rack::Server.new(rack_settings).start do |_server|
         SmartProxyDynflowCore::Core.ensure_initialized
+        SmartProxyDynflowCore::SdNotify.new.tap { |sd| sd.ready if sd.active? }
       end
     end
 
@@ -82,7 +84,7 @@ module SmartProxyDynflowCore
         :AccessLog => [[Log.instance, WEBrick::AccessLog::COMMON_LOG_FORMAT]],
         :Logger => Log.instance,
         :daemonize => Settings.instance.daemonize,
-        :pid => Settings.instance.pid_file,
+        :pid => Settings.instance.daemonize && Settings.instance.pid_file,
         :server => :webrick
       }
     end

data/lib/smart_proxy_dynflow_core/sd_notify.rb

@@ -0,0 +1,33 @@
+# Shamelessly taken from theforeman/smart-proxy @ 99e9e5b
+# kudos to domcleal
+
+require 'socket'
+
+# Implementation of libsystemd's sd_notify API, sends current state via socket
+module SmartProxyDynflowCore
+  class SdNotify
+    def active?
+      !ENV['NOTIFY_SOCKET'].nil?
+    end
+
+    def notify(message)
+      create_socket.tap do |socket|
+        socket.sendmsg(message.chomp + "\n") # ensure trailing \n
+        socket.close
+      end
+    end
+
+    def ready(state = 1)
+      notify("READY=#{state}")
+    end
+
+    private
+
+    def create_socket
+      raise 'Missing NOTIFY_SOCKET environment variable, is this process running under systemd?' unless active?
+      Socket.new(Socket::AF_UNIX, Socket::SOCK_DGRAM, 0).tap do |socket|
+        socket.connect(Socket.pack_sockaddr_un(ENV['NOTIFY_SOCKET']))
+      end
+    end
+  end
+end

data/lib/smart_proxy_dynflow_core/version.rb

@@ -1,3 +1,3 @@
 module SmartProxyDynflowCore
-  VERSION = '0.2.5'.freeze
+  VERSION = '0.2.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dynflow_core
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -214,6 +214,7 @@ files:
 - lib/smart_proxy_dynflow_core/helpers.rb
 - lib/smart_proxy_dynflow_core/launcher.rb
 - lib/smart_proxy_dynflow_core/log.rb
+- lib/smart_proxy_dynflow_core/sd_notify.rb
 - lib/smart_proxy_dynflow_core/settings.rb
 - lib/smart_proxy_dynflow_core/task_launcher_registry.rb
 - lib/smart_proxy_dynflow_core/testing.rb