process_controller 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c500f9338466a353da79e0b1e9474924ebb47952
-  data.tar.gz: 0c709ceb07406b33e958166871449e8caeb44cff
+  metadata.gz: d4f8282d1b6740eda4a080f6c131349a2fc38cd7
+  data.tar.gz: d616f99ae1d8f0734b80809bf38ee370e6ebe45f
 SHA512:
-  metadata.gz: 1d0aa3e759821bcf3eb63db5f181d5d7a395b58c59064552d2045419680fa575fe64eecac63fdf685b86cfbc2068907eeaefaa25a42d54e73830b029a617f1eb
-  data.tar.gz: 4be27cb4761086a65b0325caacc653852e029657756df52083fb5d17f8f20c1f46984e06f12d3d921bcefcdf76b9e0bca0a7dc801ac6a11d7fc08bc92bb767de
+  metadata.gz: 13a6be95655ec1d751c95b68dfe58edbc04e19f5243a675bc2c4e21d0bdf56eb0a10e321bd9971ff774d9a9f47ca19b37b2c5d9554c3f0ec8ec4c03a5ff84489
+  data.tar.gz: 11419c027bd14c442a3741f426626dc068977df5d6211bb8a4e1bbbe1a3d6ce8909085d991cd0a1e1490eddde394ac29bc2ce48a31a945ca6314528514f13941

data/lib/control/version.rb

@@ -1,3 +1,3 @@
 module Control
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/lib/control_helper.rb

@@ -23,6 +23,7 @@ module ControlHelper
 	end
 
 	def get_pid_from_file(pid_filename)
+		return nil unless File.exists?(pid_filename)
 		File.open(pid_filename, &:readline).strip
 	end
 	
@@ -95,9 +96,21 @@ module ControlHelper
 		p "error in killing process #{e.inspect}"
 	end
 
+	# Note , only valid for http servers
 	def restart_the_app!(options)
-		restart_command = options.fetch(Control_P::OPTIONS_ATTRIBUTES[:restart_command])
-		`#{restart_command}`
+		if app_not_running?(options)
+			start_a_new_process!(options)
+		else
+			restart_command = options.fetch(Control_P::OPTIONS_ATTRIBUTES[:restart_command])
+			`#{restart_command}`
+			sleep(5)
+		end
+	end
+
+	def app_not_running?(options)
+		pid_filename = options.fetch(Control_P::OPTIONS_ATTRIBUTES[:pid_filename], nil)
+		raise "no pid filename found in #{options}" if pid_filename.nil?
+		'' == `cat #{pid_filename}`
 	end
 
 	def kill_with_retries!(options)
@@ -134,16 +147,17 @@ module ControlHelper
 
 	#TODO add option to overwrite the file names
 	def print_workers_started_and_stopped(options)
-		print_file('workers_started', Control_P::WORKERS_STARTED_EXTENTION)
-		print_file('workers_closed', Control_P::WORKERS_CLOSED_EXTENTION)
+		print_workers_and_delete_files!('workers started', Control_P::WORKERS_STARTED_EXTENTION)
+		print_workers_and_delete_files!('workers closed', Control_P::WORKERS_CLOSED_EXTENTION)
 	end
 
-	def print_file(type, file_name)
-		p type + Dir["*.closed"].length
+	def print_workers_and_delete_files!(type, extention)
+		p "#{Dir[extention].length.to_s} #{type}"
+		Dir.glob(extention).each { |f| File.delete(f) }
 	end
 
 	def http_server?(options)
-		true == options.fetch(OPTIONS_ATTRIBUTES[:http_server], false) 
+		true == options.fetch(Control_P::OPTIONS_ATTRIBUTES[:http_server], false) 
 	end
 
 	def kill_the_old_process_if_needed(options)

data/lib/process_controller.rb

@@ -10,8 +10,8 @@ class Control_P
 							start_command: 'start_command'}.with_indifferent_access
 
 	FIND_BY_OPTIONS = {app_filename: 'app_filename', port_num: 'port_num', app_name: 'app_name', pid_file: 'pid_file'}.with_indifferent_access
-	WORKERS_STARTED_EXTENTION = 'started'
-	WORKERS_CLOSED_EXTENTION = 'closed'
+	WORKERS_STARTED_EXTENTION = '*.started'
+	WORKERS_CLOSED_EXTENTION = '*.closed'
 
 	HOSTNAME = Socket.gethostname
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: process_controller
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - ohad partuck