whats-up-adhearsion 0.1.5 → 0.1.6

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.
Files changed (2) hide show
  1. data/lib/whats-up-adhearsion.rb +20 -10
  2. metadata +27 -16
data/lib/whats-up-adhearsion.rb CHANGED
@@ -5,18 +5,22 @@ rescue LoadError
5
5
  abort "ERROR: whats_up_adhearsion requires the 'rack' and 'json' gems"
6
6
  end
7
7
 
8
+ begin
9
+ require 'active_record'
10
+ class ActiveRecord::ConnectionAdapters::ConnectionPool
11
+ attr_reader :checked_out
12
+ end
13
+ rescue LoadError
14
+ end
15
+
8
16
  WHATS_UP_ADHEARSION_HANDLER = lambda do |env|
9
17
  json = env["rack.input"].read
10
18
  json = json.blank? ? nil : JSON.parse(json)
11
- if env["PATH_INFO"] =~ /favicon.ico/
12
- []
13
- else
14
- path = env["PATH_INFO"]
15
- path = path[1..-1]
16
- rpc_object = Adhearsion::Components.component_manager.extend_object_with(Object.new, :rpc)
17
- response_object = rpc_object.send(path, *json)
18
- [200, {"Content-Type" => response_object[:type]}, Array(response_object[:response])]
19
- end
19
+ path = env["PATH_INFO"]
20
+ path = path[1..-1]
21
+ rpc_object = Adhearsion::Components.component_manager.extend_object_with(Object.new, :rpc)
22
+ response_object = rpc_object.send(path, *json)
23
+ [200, {"Content-Type" => response_object[:type]}, Array(response_object[:response])]
20
24
  end
21
25
 
22
26
  initialization do
@@ -34,7 +38,13 @@ methods_for :rpc do
34
38
  end
35
39
 
36
40
  def status()
37
- {:type => 'application/json', :response => JSON.generate({:number_of_calls => Adhearsion.active_calls.size})}
41
+ response_hash = {:number_of_calls => Adhearsion.active_calls.size}
42
+ begin
43
+ response_hash[:active_connections] = ActiveRecord::Base.connection_pool.checked_out.size
44
+ response_hash[:connection_pool_size] = ActiveRecord::Base.connection_pool.connections.size
45
+ rescue NameError
46
+ end
47
+ {:type => 'application/json', :response => JSON.generate(response_hash)}
38
48
  end
39
49
  end
40
50
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: whats-up-adhearsion
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.5
4
+ version: 0.1.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,12 +9,12 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-10-02 00:00:00.000000000 -04:00
12
+ date: 2011-10-27 00:00:00.000000000 -04:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: adhearsion
17
- requirement: &2160200800 !ruby/object:Gem::Requirement
17
+ requirement: &2156641880 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
22
22
  version: '0'
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *2160200800
25
+ version_requirements: *2156641880
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: json
28
- requirement: &2160200340 !ruby/object:Gem::Requirement
28
+ requirement: &2156648420 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *2160200340
36
+ version_requirements: *2156648420
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: rack
39
- requirement: &2160226280 !ruby/object:Gem::Requirement
39
+ requirement: &2156653880 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
44
44
  version: '0'
45
45
  type: :runtime
46
46
  prerelease: false
47
- version_requirements: *2160226280
47
+ version_requirements: *2156653880
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: mongrel
50
- requirement: &2160225780 !ruby/object:Gem::Requirement
50
+ requirement: &2156661180 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
55
55
  version: 1.2.0.pre2
56
56
  type: :runtime
57
57
  prerelease: false
58
- version_requirements: *2160225780
58
+ version_requirements: *2156661180
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: rspec
61
- requirement: &2160225360 !ruby/object:Gem::Requirement
61
+ requirement: &2160234200 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
64
  - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
66
66
  version: '0'
67
67
  type: :development
68
68
  prerelease: false
69
- version_requirements: *2160225360
69
+ version_requirements: *2160234200
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: flexmock
72
- requirement: &2160224900 !ruby/object:Gem::Requirement
72
+ requirement: &2160839480 !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
75
  - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
77
77
  version: '0'
78
78
  type: :development
79
79
  prerelease: false
80
- version_requirements: *2160224900
80
+ version_requirements: *2160839480
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: jeweler
83
- requirement: &2160224480 !ruby/object:Gem::Requirement
83
+ requirement: &2160856680 !ruby/object:Gem::Requirement
84
84
  none: false
85
85
  requirements:
86
86
  - - ! '>='
@@ -88,7 +88,18 @@ dependencies:
88
88
  version: '0'
89
89
  type: :development
90
90
  prerelease: false
91
- version_requirements: *2160224480
91
+ version_requirements: *2160856680
92
+ - !ruby/object:Gem::Dependency
93
+ name: activerecord
94
+ requirement: &2160867560 !ruby/object:Gem::Requirement
95
+ none: false
96
+ requirements:
97
+ - - ! '>='
98
+ - !ruby/object:Gem::Version
99
+ version: '0'
100
+ type: :development
101
+ prerelease: false
102
+ version_requirements: *2160867560
92
103
  description: Allows you to get information about Adhearsions status via rest calls
93
104
  email: dev&adhearsion.com
94
105
  executables: []