Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing timeout issue #264

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions god.gemspec
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
Gem::Specification.new do |s|
s.specification_version = 2 if s.respond_to? :specification_version=
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
# s.specification_version = 2 if s.respond_to? :specification_version=
# s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=

s.name = 'god'
s.version = '0.13.7'
s.version = '0.13.8.1'
s.date = '2015-10-19'

s.summary = "Process monitoring framework."
s.description = "An easy to configure, easy to extend monitoring framework written in Ruby."
s.description = "An easy to configure, easy to extend monitoring framework written in Ruby.(with add on timeout fix)"

s.authors = ["Tom Preston-Werner", "Kevin Clark", "Eric Lindvall"]
s.authors = ["Tom Preston-Werner", "Kevin Clark", "Eric Lindvall", "Praveen Kumar Sinha"]
s.email = '[email protected]'
s.homepage = 'http://god.rubyforge.org/'

s.rubyforge_project = 'god'
s.rubygems_version = '1.3.5'
# s.rubygems_version = '1.3.5'
s.require_paths = %w[lib ext]

s.executables = ["god"]
Expand All @@ -31,7 +31,7 @@ Gem::Specification.new do |s|
s.add_development_dependency('prowly', '~> 0.3')
s.add_development_dependency('xmpp4r', '~> 0.5')
s.add_development_dependency('dike', '~> 0.0.3')
# s.add_development_dependency('rcov', '~> 0.9')
# s.add_development_dependency('rcov', '~> 0.9')
s.add_development_dependency('daemons', '~> 1.1')
s.add_development_dependency('mocha', '~> 0.10')
s.add_development_dependency('gollum', '~> 1.3.1')
Expand Down
2 changes: 1 addition & 1 deletion lib/god/system/slash_proc_poller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def percent_cpu
# read from them. Try to use this sparingly as it is expensive.
def self.readable?(path)
begin
timeout(1) { File.read(path) }
Timeout::timeout(1) { File.read(path) }
rescue Timeout::Error
false
end
Expand Down