ocular 0.1.11 → 0.1.12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/ocular +12 -2
- data/lib/ocular/dsl/orbit.rb +0 -1
- data/lib/ocular/inputs/http_input.rb +1 -0
- data/lib/ocular/logging/console_logger.rb +32 -1
- data/lib/ocular/logging/kafka_logger.rb +34 -2
- data/lib/ocular/logging/multilogger.rb +21 -0
- data/lib/ocular/logging/severity.rb +0 -1
- data/lib/ocular/ocular.rb +17 -1
- data/lib/ocular/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 648cb29cda1d62aec449575ab959c8b76c62e9e0
|
4
|
+
data.tar.gz: 4aa22c197a871dfc6b9f8c7082e36aeb98361d8e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d8412dd38f44a2858187e00417db2afe1a8f842eb2fef96a3d209fb99df1461270f67b5f693f006088687a83dc8db8a449bfafe8b9dad4f774c157ecc177ca93
|
7
|
+
data.tar.gz: 76b31a5c15a8feedeef0132715b899c0a5c82e98a773e07374eeaf6c5380831cc55906638900b1b1a1bdfb26e2c5d2194fffddf14e769b359bf1bcb7bd37a729
|
data/bin/ocular
CHANGED
@@ -24,6 +24,7 @@ class OptparseExample
|
|
24
24
|
options.settings = nil
|
25
25
|
options.root = nil
|
26
26
|
options.check = nil
|
27
|
+
options.level = "DEBUG"
|
27
28
|
|
28
29
|
opt_parser = OptionParser.new do |opts|
|
29
30
|
opts.banner = "Usage in shell mode: \"ocular [options] <script file>\" or server mode: \"ocular --server [options]\""
|
@@ -64,6 +65,10 @@ class OptparseExample
|
|
64
65
|
options.check = true
|
65
66
|
end
|
66
67
|
|
68
|
+
opts.on("--level LEVEL", "Log level") do |level|
|
69
|
+
options.level = level
|
70
|
+
end
|
71
|
+
|
67
72
|
end
|
68
73
|
|
69
74
|
opt_parser.parse!(args)
|
@@ -106,7 +111,10 @@ if Ocular::Settings.get(:loggers)
|
|
106
111
|
Ocular::Settings.get(:loggers).each do |name, settings|
|
107
112
|
name = name.to_s
|
108
113
|
if name == "console"
|
109
|
-
|
114
|
+
console_logger = Ocular::Logging::ConsoleLogger.new(settings)
|
115
|
+
console_logger.set_level(options.level)
|
116
|
+
logger.add_logger(console_logger)
|
117
|
+
|
110
118
|
elsif name == "kafka"
|
111
119
|
logger.add_logger(Ocular::Logging::KafkaLogger.new(settings))
|
112
120
|
else
|
@@ -117,6 +125,8 @@ else
|
|
117
125
|
logger.add_logger(Ocular::Logging::ConsoleLogger.new)
|
118
126
|
end
|
119
127
|
|
128
|
+
Ocular.set_global_logger(logger)
|
129
|
+
|
120
130
|
if options.server or options.syntax
|
121
131
|
if !options.root && !Ocular::Settings.get(:script_root)
|
122
132
|
puts "Please specify --root or set script_root in the settings.yaml"
|
@@ -132,7 +142,7 @@ if options.server or options.syntax
|
|
132
142
|
|
133
143
|
daemon.start_input_handlers()
|
134
144
|
|
135
|
-
|
145
|
+
Ocular.logger.info "server started"
|
136
146
|
daemon.wait()
|
137
147
|
|
138
148
|
else
|
data/lib/ocular/dsl/orbit.rb
CHANGED
@@ -531,6 +531,7 @@ class Ocular
|
|
531
531
|
if @settings[:verbose]
|
532
532
|
@app = Rack::CommonLogger.new(@app, STDOUT)
|
533
533
|
end
|
534
|
+
::Ocular.logger.debug "Puma HTTP server started with settings #{@settings}"
|
534
535
|
|
535
536
|
@thread = Thread.new do
|
536
537
|
events_hander = @settings[:silent] ? ::Puma::Events.strings : ::Puma::Events.stdio
|
@@ -1,3 +1,4 @@
|
|
1
|
+
require 'ocular/logging/severity.rb'
|
1
2
|
|
2
3
|
class Ocular
|
3
4
|
module Logging
|
@@ -8,7 +9,37 @@ class Ocular
|
|
8
9
|
def initialize(settings=nil)
|
9
10
|
@level = Severity::INFO
|
10
11
|
@formatter = Formatter.new
|
11
|
-
end
|
12
|
+
end
|
13
|
+
|
14
|
+
def set_level(level)
|
15
|
+
l = Severity::LABELS.index(level)
|
16
|
+
if l == nil
|
17
|
+
puts "Invalid debug level #{level}. Supported levels: #{Severity::LABELS}"
|
18
|
+
l = 0
|
19
|
+
end
|
20
|
+
@level = l
|
21
|
+
end
|
22
|
+
|
23
|
+
def debug(message = nil, &block)
|
24
|
+
add(Severity::DEBUG, message, @run_id, &block)
|
25
|
+
end
|
26
|
+
alias log debug
|
27
|
+
|
28
|
+
def info(message = nil, &block)
|
29
|
+
add(Severity::INFO, message, @run_id, &block)
|
30
|
+
end
|
31
|
+
|
32
|
+
def warn(message = nil, &block)
|
33
|
+
add(Severity::WARN, message, @run_id, &block)
|
34
|
+
end
|
35
|
+
|
36
|
+
def error(message = nil, &block)
|
37
|
+
add(Severity::ERROR, message, @run_id, &block)
|
38
|
+
end
|
39
|
+
|
40
|
+
def fatal(message = nil, &block)
|
41
|
+
add(Severity::FATAL, message, @run_id, &block)
|
42
|
+
end
|
12
43
|
|
13
44
|
def add(severity, message = nil, run_id = nil, &block)
|
14
45
|
severity ||= Severity::UNKNOWN
|
@@ -1,4 +1,5 @@
|
|
1
1
|
require "kafka"
|
2
|
+
require "socket"
|
2
3
|
|
3
4
|
class Ocular
|
4
5
|
module Logging
|
@@ -20,6 +21,27 @@ class Ocular
|
|
20
21
|
@producer = @kafka.producer
|
21
22
|
end
|
22
23
|
|
24
|
+
def debug(message = nil, &block)
|
25
|
+
add(Severity::DEBUG, message, @run_id, &block)
|
26
|
+
end
|
27
|
+
alias log debug
|
28
|
+
|
29
|
+
def info(message = nil, &block)
|
30
|
+
add(Severity::INFO, message, @run_id, &block)
|
31
|
+
end
|
32
|
+
|
33
|
+
def warn(message = nil, &block)
|
34
|
+
add(Severity::WARN, message, @run_id, &block)
|
35
|
+
end
|
36
|
+
|
37
|
+
def error(message = nil, &block)
|
38
|
+
add(Severity::ERROR, message, @run_id, &block)
|
39
|
+
end
|
40
|
+
|
41
|
+
def fatal(message = nil, &block)
|
42
|
+
add(Severity::FATAL, message, @run_id, &block)
|
43
|
+
end
|
44
|
+
|
23
45
|
def add(severity, message = nil, run_id = nil, &block)
|
24
46
|
severity ||= Severity::UNKNOWN
|
25
47
|
if severity < @level
|
@@ -68,7 +90,8 @@ class Ocular
|
|
68
90
|
"level" => Ocular::Logging::Severity::LABELS[severity],
|
69
91
|
"@timestamp" => format_datetime(time),
|
70
92
|
"run_id" => progname,
|
71
|
-
"msg" => msg2str(msg)
|
93
|
+
"msg" => msg2str(msg),
|
94
|
+
"host" => hostname
|
72
95
|
}
|
73
96
|
return data.to_json
|
74
97
|
end
|
@@ -77,6 +100,7 @@ class Ocular
|
|
77
100
|
data = {
|
78
101
|
"@timestamp" => format_datetime(time),
|
79
102
|
"run_id" => progname,
|
103
|
+
"host" => hostname
|
80
104
|
}
|
81
105
|
data[property] = value
|
82
106
|
return data.to_json
|
@@ -87,7 +111,8 @@ class Ocular
|
|
87
111
|
"@timestamp" => format_datetime(time),
|
88
112
|
"run_id" => progname,
|
89
113
|
"triggered_by" => type,
|
90
|
-
"environment" => environment
|
114
|
+
"environment" => environment,
|
115
|
+
"host" => hostname
|
91
116
|
}
|
92
117
|
|
93
118
|
return data.to_json
|
@@ -110,6 +135,13 @@ class Ocular
|
|
110
135
|
msg.inspect
|
111
136
|
end
|
112
137
|
end
|
138
|
+
|
139
|
+
def hostname
|
140
|
+
if !@hostname
|
141
|
+
@hostname = Socket.gethostname
|
142
|
+
end
|
143
|
+
return @hostname
|
144
|
+
end
|
113
145
|
end
|
114
146
|
end
|
115
147
|
end
|
@@ -14,6 +14,27 @@ class Ocular
|
|
14
14
|
@loggers << logger
|
15
15
|
end
|
16
16
|
|
17
|
+
def debug(message = nil, &block)
|
18
|
+
add(Severity::DEBUG, message, @run_id, &block)
|
19
|
+
end
|
20
|
+
alias log debug
|
21
|
+
|
22
|
+
def info(message = nil, &block)
|
23
|
+
add(Severity::INFO, message, @run_id, &block)
|
24
|
+
end
|
25
|
+
|
26
|
+
def warn(message = nil, &block)
|
27
|
+
add(Severity::WARN, message, @run_id, &block)
|
28
|
+
end
|
29
|
+
|
30
|
+
def error(message = nil, &block)
|
31
|
+
add(Severity::ERROR, message, @run_id, &block)
|
32
|
+
end
|
33
|
+
|
34
|
+
def fatal(message = nil, &block)
|
35
|
+
add(Severity::FATAL, message, @run_id, &block)
|
36
|
+
end
|
37
|
+
|
17
38
|
def add(severity, message = nil, run_id = nil, &block)
|
18
39
|
|
19
40
|
if message.nil?
|
data/lib/ocular/ocular.rb
CHANGED
@@ -1,7 +1,21 @@
|
|
1
|
+
require 'ocular/logging/console_logger.rb'
|
2
|
+
|
3
|
+
$ocular_global_logger = Ocular::Logging::ConsoleLogger.new
|
4
|
+
|
5
|
+
class Ocular
|
6
|
+
|
7
|
+
def self.logger
|
8
|
+
return $ocular_global_logger
|
9
|
+
end
|
10
|
+
|
11
|
+
def self.set_global_logger(logger)
|
12
|
+
$ocular_global_logger = logger
|
13
|
+
end
|
14
|
+
end
|
1
15
|
|
2
16
|
require 'ocular/version'
|
3
|
-
require 'ocular/settings'
|
4
17
|
require 'ocular/logging/logging'
|
18
|
+
require 'ocular/settings'
|
5
19
|
require 'ocular/event/eventbase'
|
6
20
|
require 'ocular/event/eventfactory'
|
7
21
|
require 'ocular/dsl/dsl'
|
@@ -11,3 +25,5 @@ require 'ocular/inputs/handlers'
|
|
11
25
|
require 'ocular/inputs/base'
|
12
26
|
require 'ocular/inputs/http_input'
|
13
27
|
require 'ocular/daemon'
|
28
|
+
|
29
|
+
|
data/lib/ocular/version.rb
CHANGED