progstr-ruby 1.0.4 → 1.0.5
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile.lock +4 -4
- data/VERSION +1 -1
- data/lib/progstr/config.rb +5 -1
- data/lib/progstr/logger_device.rb +13 -5
- data/progstr-ruby.gemspec +2 -2
- data/test/test_formatter.rb +26 -2
- metadata +13 -13
data/Gemfile.lock
CHANGED
@@ -2,13 +2,13 @@ GEM
|
|
2
2
|
remote: http://rubygems.org/
|
3
3
|
specs:
|
4
4
|
git (1.2.5)
|
5
|
-
jeweler (1.6.
|
5
|
+
jeweler (1.6.4)
|
6
6
|
bundler (~> 1.0)
|
7
7
|
git (>= 1.2.5)
|
8
8
|
rake
|
9
|
-
multi_json (1.0.
|
10
|
-
rake (0.9.2)
|
11
|
-
rcov (0.9.
|
9
|
+
multi_json (1.0.4)
|
10
|
+
rake (0.9.2.2)
|
11
|
+
rcov (0.9.11)
|
12
12
|
shoulda (2.11.3)
|
13
13
|
|
14
14
|
PLATFORMS
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.0.
|
1
|
+
1.0.5
|
data/lib/progstr/config.rb
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
module Progstr
|
2
2
|
class << self
|
3
|
-
attr_accessor :host, :path_prefix, :port, :secure, :api_key, :http_open_timeout, :http_read_timeout, :proxy_host, :proxy_port, :proxy_user, :proxy_pass
|
3
|
+
attr_accessor :host, :path_prefix, :port, :secure, :api_key, :http_open_timeout, :http_read_timeout, :proxy_host, :proxy_port, :proxy_user, :proxy_pass, :log_debug_events
|
4
4
|
|
5
5
|
def host
|
6
6
|
@host ||= "api.progstr.com"
|
@@ -18,5 +18,9 @@ module Progstr
|
|
18
18
|
def http_read_timeout
|
19
19
|
@http_read_timeout ||= 15
|
20
20
|
end
|
21
|
+
|
22
|
+
def log_debug_events
|
23
|
+
@log_debug_events ||= false
|
24
|
+
end
|
21
25
|
end
|
22
26
|
end
|
@@ -22,15 +22,23 @@ module Progstr
|
|
22
22
|
def formatter
|
23
23
|
proc do |severity, datetime, progname, msg|
|
24
24
|
level = resolve_level(severity)
|
25
|
-
|
26
|
-
:
|
27
|
-
|
28
|
-
|
25
|
+
unless level.nil?
|
26
|
+
Progstr::LogMessage.new :text => msg,
|
27
|
+
:level => resolve_level(severity),
|
28
|
+
:time => datetime,
|
29
|
+
:source => resolve_source(progname)
|
30
|
+
else
|
31
|
+
nil
|
32
|
+
end
|
29
33
|
end
|
30
34
|
end
|
31
35
|
|
32
36
|
def resolve_level(severity)
|
33
|
-
LEVELS_MAP[severity]
|
37
|
+
level = LEVELS_MAP[severity]
|
38
|
+
if level.nil? && Progstr.log_debug_events
|
39
|
+
level = :info
|
40
|
+
end
|
41
|
+
level
|
34
42
|
end
|
35
43
|
|
36
44
|
def resolve_source(progname)
|
data/progstr-ruby.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{progstr-ruby}
|
8
|
-
s.version = "1.0.
|
8
|
+
s.version = "1.0.5"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = [%q{Hristo Deshev}]
|
12
|
-
s.date = %q{2011-
|
12
|
+
s.date = %q{2011-12-05}
|
13
13
|
s.description = %q{Progstr Logger application logging service API client library.}
|
14
14
|
s.email = %q{hristo@progstr.com}
|
15
15
|
s.extra_rdoc_files = [
|
data/test/test_formatter.rb
CHANGED
@@ -1,11 +1,12 @@
|
|
1
1
|
require 'helper'
|
2
2
|
|
3
3
|
class TestFormatter < Test::Unit::TestCase
|
4
|
+
yesterday = Time.now - 1 * 60 * 60 * 24
|
5
|
+
|
4
6
|
should "serialize level" do
|
5
7
|
device = Progstr::LoggerDevice.new
|
6
8
|
formatter = device.formatter
|
7
9
|
|
8
|
-
yesterday = Time.now - 1 * 60 * 60 * 24
|
9
10
|
message = formatter.call("WARN", yesterday, "progname", "message body")
|
10
11
|
assert_equal "progname", message.source
|
11
12
|
assert_equal :warning, message.level
|
@@ -13,11 +14,34 @@ class TestFormatter < Test::Unit::TestCase
|
|
13
14
|
assert_equal yesterday, message.time
|
14
15
|
end
|
15
16
|
|
17
|
+
should "ignore unknown(debug) severity entries by default" do
|
18
|
+
device = Progstr::LoggerDevice.new
|
19
|
+
formatter = device.formatter
|
20
|
+
|
21
|
+
message = formatter.call("DEBUG", yesterday, "progname", "message body")
|
22
|
+
assert_nil message
|
23
|
+
end
|
24
|
+
|
25
|
+
should "log unknown(debug) entries if explicitly allowed" do
|
26
|
+
begin
|
27
|
+
Progstr.log_debug_events = true
|
28
|
+
device = Progstr::LoggerDevice.new
|
29
|
+
formatter = device.formatter
|
30
|
+
|
31
|
+
message = formatter.call("DEBUG", yesterday, "progname", "message body")
|
32
|
+
assert_equal "progname", message.source
|
33
|
+
assert_equal :info, message.level
|
34
|
+
assert_equal "message body", message.text
|
35
|
+
assert_equal yesterday, message.time
|
36
|
+
ensure
|
37
|
+
Progstr.log_debug_events = false
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
16
41
|
should "infer progname from constructor" do
|
17
42
|
device = Progstr::LoggerDevice.new("default-progname")
|
18
43
|
formatter = device.formatter
|
19
44
|
|
20
|
-
yesterday = Time.now - 1 * 60 * 60 * 24
|
21
45
|
message = formatter.call("WARN", yesterday, nil, "message body")
|
22
46
|
assert_equal "default-progname", message.source
|
23
47
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: progstr-ruby
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.5
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2011-
|
12
|
+
date: 2011-12-05 00:00:00.000000000Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: multi_json
|
16
|
-
requirement: &
|
16
|
+
requirement: &9967900 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: '0'
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *9967900
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: shoulda
|
27
|
-
requirement: &
|
27
|
+
requirement: &9966880 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: '0'
|
33
33
|
type: :development
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *9966880
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: bundler
|
38
|
-
requirement: &
|
38
|
+
requirement: &9966080 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ~>
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: 1.0.0
|
44
44
|
type: :development
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *9966080
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: jeweler
|
49
|
-
requirement: &
|
49
|
+
requirement: &9965200 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ~>
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: 1.6.2
|
55
55
|
type: :development
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *9965200
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: rcov
|
60
|
-
requirement: &
|
60
|
+
requirement: &9964400 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ! '>='
|
@@ -65,7 +65,7 @@ dependencies:
|
|
65
65
|
version: '0'
|
66
66
|
type: :development
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *9964400
|
69
69
|
description: Progstr Logger application logging service API client library.
|
70
70
|
email: hristo@progstr.com
|
71
71
|
executables: []
|
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
110
110
|
version: '0'
|
111
111
|
segments:
|
112
112
|
- 0
|
113
|
-
hash:
|
113
|
+
hash: 2106409028724498541
|
114
114
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
115
115
|
none: false
|
116
116
|
requirements:
|