leafy-health 0.6.0-java → 0.6.1-java

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/leafy-health_jars.rb +1 -1
  3. data/lib/leafy/health/health_check.rb +21 -7
  4. data/lib/leafy/health/version.rb +1 -1
  5. metadata +22 -23
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 29837323f0c465e9c26548721069bec5aed31ea1
4
- data.tar.gz: ae54b2994884f66801373ca16d8ff9c624b08d33
3
+ metadata.gz: 7b863897afe3426a96901adadaa91562368a96bd
4
+ data.tar.gz: fc564b2de7d69f97fb6283eebd6a70895d470d94
5
5
  SHA512:
6
- metadata.gz: 13d8e916da73761ba76736c2d0d7d3582f37e580122e26f370310c8fe0e3b5817ba47888f4afbb441a78cbeed66022c3a8b1b5b417791d322552cc353839d2de
7
- data.tar.gz: 67a0d3ee32378ddb1abf5e8b9638138624031ee261fd007a25ea977c021f5fdf40d7a27c6421eaf98f64dfc82d7ce7ed79e5197366227b845dda9588b7766f0b
6
+ metadata.gz: 982714bb28869c134c1f6b7ba0be18e0d7ccf1b26700e690de6a2c7533326f31a6f4eeabfa71301bfc4d41622844af1c222add26e156f421326b427a7f55aa95
7
+ data.tar.gz: 7ab3e18574d465fd7c2b5c8edc3bf72dfe1a1c7345c4dd5ff50144d62e72ce2ae3bdb655b5de23820becd71e14fde1a8e9c226d50e00fd145af0be8be999927e
data/lib/leafy-health_jars.rb CHANGED
@@ -2,6 +2,6 @@
2
2
  require 'jar_dependencies'
3
3
 
4
4
  require_jar( 'io.dropwizard.metrics', 'metrics-healthchecks', '3.1.0' )
5
- require_jar( 'org.slf4j', 'slf4j-api', '1.7.7' )
6
5
  require_jar( 'io.dropwizard.metrics', 'metrics-jvm', '3.1.0' )
7
6
  require_jar( 'io.dropwizard.metrics', 'metrics-core', '3.1.0' )
7
+ require_jar( 'org.slf4j', 'slf4j-api', '1.7.7' )
data/lib/leafy/health/health_check.rb CHANGED
@@ -6,13 +6,31 @@ class com.codahale.metrics.health.HealthCheck::Result
6
6
  attr_writer :data
7
7
 
8
8
  def to_json( *args )
9
- { :healthy => healthy?, :message => @data || message }.to_json( *args )
9
+ # check if it is a Hash.json and treat it as json
10
+ if message =~ /^{.+}$/
11
+ msg = Leafy::Health::JsonString.new( message )
12
+ else
13
+ msg = message
14
+ end
15
+ { :healthy => healthy?, :message => @data || msg }.to_json( *args )
10
16
  end
11
17
  end
12
18
 
13
19
  module Leafy
14
20
  module Health
21
+ class JsonString < String
22
+
23
+ def to_json(*args)
24
+ self
25
+ end
26
+
27
+ def as_json(*args)
28
+ self
29
+ end
30
+ end
31
+
15
32
  ThreadDeadlockHealthCheck = com.codahale.metrics.health.jvm.ThreadDeadlockHealthCheck
33
+
16
34
  class HealthCheck < com.codahale.metrics.health.HealthCheck
17
35
 
18
36
  def initialize( &block )
@@ -25,9 +43,7 @@ module Leafy
25
43
  # return [com.codahale.metrics.health.HealthCheck::Result]
26
44
  def healthy( result = nil )
27
45
  if result.is_a? Hash
28
- r = com.codahale.metrics.health.HealthCheck::Result.healthy( result.to_json )
29
- r.data = result
30
- r
46
+ com.codahale.metrics.health.HealthCheck::Result.healthy( result.to_json )
31
47
  else
32
48
  com.codahale.metrics.health.HealthCheck::Result.healthy( result )
33
49
  end
@@ -39,9 +55,7 @@ module Leafy
39
55
  # return [com.codahale.metrics.health.HealthCheck::Result]
40
56
  def unhealthy( result )
41
57
  if result.is_a? Hash
42
- r = com.codahale.metrics.health.HealthCheck::Result.unhealthy( result.to_json )
43
- r.data = result
44
- r
58
+ com.codahale.metrics.health.HealthCheck::Result.unhealthy( result.to_json )
45
59
  else
46
60
  com.codahale.metrics.health.HealthCheck::Result.unhealthy( result )
47
61
  end
data/lib/leafy/health/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Leafy
2
2
  module Health
3
- VERSION = '0.6.0'.freeze
3
+ VERSION = '0.6.1'.freeze
4
4
  end
5
5
  end
6
6
 
metadata CHANGED
@@ -1,71 +1,71 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: leafy-health
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.0
4
+ version: 0.6.1
5
5
  platform: java
6
6
  authors:
7
7
  - christian meier
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-06-10 00:00:00.000000000 Z
11
+ date: 2015-08-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: jar-dependencies
15
- version_requirements: !ruby/object:Gem::Requirement
15
+ requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: 0.1.8
20
- requirement: !ruby/object:Gem::Requirement
20
+ type: :runtime
21
+ prerelease: false
22
+ version_requirements: !ruby/object:Gem::Requirement
21
23
  requirements:
22
24
  - - "~>"
23
25
  - !ruby/object:Gem::Version
24
26
  version: 0.1.8
25
- prerelease: false
26
- type: :runtime
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rspec
29
- version_requirements: !ruby/object:Gem::Requirement
29
+ requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: '3.1'
34
- requirement: !ruby/object:Gem::Requirement
34
+ type: :development
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
35
37
  requirements:
36
38
  - - "~>"
37
39
  - !ruby/object:Gem::Version
38
40
  version: '3.1'
39
- prerelease: false
40
- type: :development
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: yard
43
- version_requirements: !ruby/object:Gem::Requirement
43
+ requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
47
  version: 0.8.7
48
- requirement: !ruby/object:Gem::Requirement
48
+ type: :development
49
+ prerelease: false
50
+ version_requirements: !ruby/object:Gem::Requirement
49
51
  requirements:
50
52
  - - "~>"
51
53
  - !ruby/object:Gem::Version
52
54
  version: 0.8.7
53
- prerelease: false
54
- type: :development
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: rake
57
- version_requirements: !ruby/object:Gem::Requirement
57
+ requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
61
  version: '10.2'
62
- requirement: !ruby/object:Gem::Requirement
62
+ type: :development
63
+ prerelease: false
64
+ version_requirements: !ruby/object:Gem::Requirement
63
65
  requirements:
64
66
  - - "~>"
65
67
  - !ruby/object:Gem::Version
66
68
  version: '10.2'
67
- prerelease: false
68
- type: :development
69
69
  description: provides an API to register healthchecks which uses dropwizrd-metrics-healthchecks
70
70
  email:
71
71
  - christian.meier@lookout.com
@@ -91,7 +91,7 @@ homepage: https://github.com/lookout/leafy
91
91
  licenses:
92
92
  - MIT
93
93
  metadata: {}
94
- post_install_message:
94
+ post_install_message:
95
95
  rdoc_options: []
96
96
  require_paths:
97
97
  - lib
@@ -108,10 +108,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
108
108
  requirements:
109
109
  - jar io.dropwizard.metrics:metrics-healthchecks, 3.1.0
110
110
  - jar io.dropwizard.metrics:metrics-jvm, 3.1.0
111
- rubyforge_project:
111
+ rubyforge_project:
112
112
  rubygems_version: 2.4.5
113
- signing_key:
113
+ signing_key:
114
114
  specification_version: 4
115
115
  summary: provides an API to register healthchecks
116
116
  test_files: []
117
- has_rdoc: