scout_rails 1.1.0 → 1.1.1.pre
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/CHANGELOG.markdown +5 -0
- data/lib/scout_rails/environment.rb +14 -4
- data/lib/scout_rails/version.rb +1 -1
- metadata +5 -5
data/CHANGELOG.markdown
CHANGED
|
@@ -51,12 +51,22 @@ module ScoutRails
|
|
|
51
51
|
end
|
|
52
52
|
end
|
|
53
53
|
|
|
54
|
+
# This needs to be improved. Frequently, multiple app servers gem are present and which
|
|
55
|
+
# ever is checked first becomes the designated app server.
|
|
56
|
+
#
|
|
57
|
+
# I've put Thin and Webrick last as they are often used in development and included in Gemfiles
|
|
58
|
+
# but less likely used in production.
|
|
59
|
+
#
|
|
60
|
+
# Next step: (1) list out all detected app servers (2) install hooks for those that need it (passenger, rainbows, unicorn).
|
|
61
|
+
#
|
|
62
|
+
# Believe the biggest downside is the master process for forking app servers will get a background worker. Not sure how this will
|
|
63
|
+
# impact metrics (it shouldn't process requests).
|
|
54
64
|
def app_server
|
|
55
|
-
@app_server ||= if
|
|
56
|
-
elsif passenger? then :passenger
|
|
57
|
-
elsif webrick? then :webrick
|
|
65
|
+
@app_server ||= if passenger? then :passenger
|
|
58
66
|
elsif rainbows? then :rainbows
|
|
59
67
|
elsif unicorn? then :unicorn
|
|
68
|
+
elsif thin? then :thin
|
|
69
|
+
elsif webrick then :webrick
|
|
60
70
|
else nil
|
|
61
71
|
end
|
|
62
72
|
end
|
|
@@ -75,7 +85,7 @@ module ScoutRails
|
|
|
75
85
|
# inside the passenger worker process.
|
|
76
86
|
# Background: http://www.modrails.com/documentation/Users%20guide%20Nginx.html#spawning%5Fmethods%5Fexplained
|
|
77
87
|
def passenger?
|
|
78
|
-
(defined?(::Passenger) && defined?(::Passenger::AbstractServer)) || defined?(::
|
|
88
|
+
(defined?(::Passenger) && defined?(::Passenger::AbstractServer)) || defined?(::PhusionPassenger)
|
|
79
89
|
end
|
|
80
90
|
|
|
81
91
|
def webrick?
|
data/lib/scout_rails/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: scout_rails
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.1.
|
|
5
|
-
prerelease:
|
|
4
|
+
version: 1.1.1.pre
|
|
5
|
+
prerelease: 6
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
8
8
|
- Derek Haynes
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date:
|
|
13
|
+
date: 2013-01-29 00:00:00.000000000 Z
|
|
14
14
|
dependencies: []
|
|
15
15
|
description: Monitors a Ruby on Rails application and reports detailed metrics on
|
|
16
16
|
performance to Scout, a hosted monitoring service.
|
|
@@ -65,9 +65,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
65
65
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
66
66
|
none: false
|
|
67
67
|
requirements:
|
|
68
|
-
- - ! '
|
|
68
|
+
- - ! '>'
|
|
69
69
|
- !ruby/object:Gem::Version
|
|
70
|
-
version:
|
|
70
|
+
version: 1.3.1
|
|
71
71
|
requirements: []
|
|
72
72
|
rubyforge_project: scout_rails
|
|
73
73
|
rubygems_version: 1.8.10
|