ocular 0.1.19 → 0.1.20
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.
- checksums.yaml +4 -4
- data/lib/ocular/dsl/fog.rb +12 -0
- data/lib/ocular/dsl/runcontext.rb +5 -0
- data/lib/ocular/event/eventbase.rb +3 -0
- data/lib/ocular/logging/console_logger.rb +4 -1
- data/lib/ocular/logging/kafka_logger.rb +32 -9
- data/lib/ocular/logging/multilogger.rb +6 -0
- data/lib/ocular/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b708d299a7b3b89d8a5cafd01e951e425c92f5a9
|
|
4
|
+
data.tar.gz: d38f64555894415292a57b0f6fd2533d18f1e61f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3a3b598021d288280c3ea97e4e899fd5ddc47ed291701ea36c4563a819cc3d017e85d766d47fffb78b72d9c8b0bfbbadef259505d0c5a12bcceb6d152cdc84f6
|
|
7
|
+
data.tar.gz: d17343570d2be86673a7785e640acf8ff0edde04d86136bc2640fbc5f6b266db5a6e4d734415e818ceee3bdebc157936f94103a35613daaa97f77d3e2974eda6
|
data/lib/ocular/dsl/fog.rb
CHANGED
|
@@ -56,6 +56,18 @@ class Ocular
|
|
|
56
56
|
return ret.first
|
|
57
57
|
end
|
|
58
58
|
|
|
59
|
+
add_help "find_server_by_id", "Returns Fog::Compute::AWS::Server or nil"
|
|
60
|
+
def find_server_by_id(id)
|
|
61
|
+
ret = aws().servers.all("instance-id" => id)
|
|
62
|
+
if ret.length > 1
|
|
63
|
+
raise "Too many matching servers by just one ip #{ip}"
|
|
64
|
+
end
|
|
65
|
+
if ret.length == 0
|
|
66
|
+
return nil
|
|
67
|
+
end
|
|
68
|
+
return ret.first
|
|
69
|
+
end
|
|
70
|
+
|
|
59
71
|
end
|
|
60
72
|
|
|
61
73
|
end
|
|
@@ -9,6 +9,7 @@ class Ocular
|
|
|
9
9
|
attr_accessor :proxy
|
|
10
10
|
attr_accessor :class_name
|
|
11
11
|
attr_accessor :event_signature
|
|
12
|
+
attr_accessor :logger
|
|
12
13
|
|
|
13
14
|
include Ocular::DSL::Logging
|
|
14
15
|
include Ocular::DSL::SSH
|
|
@@ -43,6 +44,10 @@ class Ocular
|
|
|
43
44
|
i.call()
|
|
44
45
|
end
|
|
45
46
|
end
|
|
47
|
+
|
|
48
|
+
def after_fork()
|
|
49
|
+
@logger.reconnect()
|
|
50
|
+
end
|
|
46
51
|
end
|
|
47
52
|
|
|
48
53
|
class REPLRunContext < RunContext
|
|
@@ -40,6 +40,8 @@ class Ocular
|
|
|
40
40
|
reader.close
|
|
41
41
|
r = Results.new
|
|
42
42
|
|
|
43
|
+
context.after_fork()
|
|
44
|
+
|
|
43
45
|
begin
|
|
44
46
|
r.response = __call(context, @callback)
|
|
45
47
|
rescue Exception => error
|
|
@@ -65,6 +67,7 @@ class Ocular
|
|
|
65
67
|
if r.error
|
|
66
68
|
raise r.error
|
|
67
69
|
end
|
|
70
|
+
puts "done"
|
|
68
71
|
return r.response
|
|
69
72
|
end
|
|
70
73
|
|
|
@@ -14,13 +14,18 @@ class Ocular
|
|
|
14
14
|
if kafka != nil
|
|
15
15
|
@kafka = kafka
|
|
16
16
|
else
|
|
17
|
+
pp settings
|
|
17
18
|
@kafka = Kafka.new(settings[:client])
|
|
18
19
|
end
|
|
19
20
|
@settings = settings
|
|
20
21
|
|
|
21
22
|
@producer = @kafka.producer
|
|
22
|
-
end
|
|
23
|
+
end
|
|
23
24
|
|
|
25
|
+
def reconnect()
|
|
26
|
+
@kafka = Kafka.new(@settings[:client])
|
|
27
|
+
end
|
|
28
|
+
|
|
24
29
|
def debug(message = nil, &block)
|
|
25
30
|
add(Severity::DEBUG, message, @run_id, &block)
|
|
26
31
|
end
|
|
@@ -56,23 +61,41 @@ class Ocular
|
|
|
56
61
|
end
|
|
57
62
|
end
|
|
58
63
|
|
|
59
|
-
|
|
60
|
-
|
|
64
|
+
begin
|
|
65
|
+
@producer.produce(@formatter.format_message(severity, Time.now, run_id, message), topic: @settings[:topic], partition_key: run_id)
|
|
66
|
+
@producer.deliver_messages
|
|
67
|
+
rescue RuntimeError => e
|
|
68
|
+
STDERR.puts "Error on producing kafka message: #{e}"
|
|
69
|
+
end
|
|
61
70
|
end
|
|
62
71
|
|
|
63
72
|
def log_event(property, value, run_id = nil)
|
|
64
|
-
|
|
65
|
-
|
|
73
|
+
begin
|
|
74
|
+
@producer.produce(@formatter.format_event(property, value, Time.now, run_id), topic: @settings[:topic], partition_key: run_id)
|
|
75
|
+
@producer.deliver_messages
|
|
76
|
+
rescue RuntimeError => e
|
|
77
|
+
STDERR.puts "Error on producing kafka log_event: #{e}"
|
|
78
|
+
end
|
|
66
79
|
end
|
|
67
80
|
|
|
68
81
|
def log_cause(type, environment, run_id = nil)
|
|
69
|
-
|
|
70
|
-
|
|
82
|
+
begin
|
|
83
|
+
@producer.produce(@formatter.format_cause(type, environment, Time.now, run_id), topic: @settings[:topic], partition_key: run_id)
|
|
84
|
+
@producer.deliver_messages
|
|
85
|
+
rescue RuntimeError => e
|
|
86
|
+
STDERR.puts "Error on producing kafka log_cause: #{e}"
|
|
87
|
+
end
|
|
88
|
+
|
|
71
89
|
end
|
|
72
90
|
|
|
73
91
|
def log_timing(key, value, run_id = nil)
|
|
74
|
-
|
|
75
|
-
|
|
92
|
+
begin
|
|
93
|
+
@producer.produce(@formatter.format_event("timing:" + key, value, Time.now, run_id), topic: @settings[:topic], partition_key: run_id)
|
|
94
|
+
@producer.deliver_messages
|
|
95
|
+
rescue RuntimeError => e
|
|
96
|
+
STDERR.puts "Error on producing kafka log_timing: #{e}"
|
|
97
|
+
end
|
|
98
|
+
|
|
76
99
|
end
|
|
77
100
|
|
|
78
101
|
# Default formatter for log messages.
|
data/lib/ocular/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ocular
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.20
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Juho Mäkinen
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-05-
|
|
11
|
+
date: 2016-05-19 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rye
|