rundock 0.4.14 → 0.4.15
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +3 -0
- data/CHANGELOG.md +7 -0
- data/lib/rundock/cli.rb +4 -0
- data/lib/rundock/logger.rb +29 -9
- data/lib/rundock/plugin/hook/file.rb +1 -1
- data/lib/rundock/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: 940c942d94419b9a6eb11d29669d6a35c8da0fe4
|
4
|
+
data.tar.gz: d7eb5f064af783640f66a0aac77eee6fe4e8cd01
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 6de9ad7cf3cf83a341a60eba88db15ac38893772c457ff6c41d432eee49c9da31181c195634a054f4f884e90e88acce73c395495a985ad29d5a869f4df5ef837
|
7
|
+
data.tar.gz: 41d324f0e916f2375d1bd687a5ee2fcbe39e7afd70f6b828efd1a0dfd3efe002bbcc094b601c54d37802be79fd6ec8904be71fd2e6f14d9774ca84d4d635b0aa
|
data/.rubocop.yml
CHANGED
data/CHANGELOG.md
CHANGED
data/lib/rundock/cli.rb
CHANGED
@@ -10,6 +10,8 @@ module Rundock
|
|
10
10
|
class_option :log_level, type: :string, aliases: ['-l'], default: 'info'
|
11
11
|
class_option :color, type: :boolean, default: true
|
12
12
|
class_option :header, type: :boolean, default: true
|
13
|
+
class_option :short_header, type: :boolean, default: false
|
14
|
+
class_option :date_header, type: :boolean, default: true
|
13
15
|
|
14
16
|
def initialize(args, opts, config)
|
15
17
|
super(args, opts, config)
|
@@ -17,6 +19,8 @@ module Rundock
|
|
17
19
|
Rundock::Logger.level = ::Logger.const_get(options[:log_level].upcase)
|
18
20
|
Rundock::Logger.formatter.colored = options[:color]
|
19
21
|
Rundock::Logger.formatter.show_header = options[:header]
|
22
|
+
Rundock::Logger.formatter.short_header = options[:short_header]
|
23
|
+
Rundock::Logger.formatter.date_header = options[:date_header]
|
20
24
|
end
|
21
25
|
|
22
26
|
desc 'version', 'Print version'
|
data/lib/rundock/logger.rb
CHANGED
@@ -11,16 +11,18 @@ module Rundock
|
|
11
11
|
attr_accessor :message
|
12
12
|
attr_accessor :indent_depth
|
13
13
|
|
14
|
-
def initialize(severity, datetime, progname, msg, indent_depth)
|
14
|
+
def initialize(severity, datetime, progname, msg, indent_depth, formatter)
|
15
15
|
@severity = severity
|
16
16
|
@datetime = datetime
|
17
17
|
@progname = progname
|
18
18
|
@message = msg
|
19
19
|
@indent_depth = indent_depth
|
20
|
+
@formatter = formatter
|
20
21
|
end
|
21
22
|
|
22
23
|
def formatted_message
|
23
|
-
|
24
|
+
@message unless @formatter
|
25
|
+
@formatter.formatted_message(@severity, @datetime, @progname, @message)
|
24
26
|
end
|
25
27
|
end
|
26
28
|
|
@@ -29,6 +31,8 @@ module Rundock
|
|
29
31
|
attr_accessor :indent_depth
|
30
32
|
attr_accessor :color
|
31
33
|
attr_accessor :show_header
|
34
|
+
attr_accessor :short_header
|
35
|
+
attr_accessor :date_header
|
32
36
|
attr_accessor :onrec
|
33
37
|
attr_accessor :buffer
|
34
38
|
|
@@ -39,13 +43,8 @@ module Rundock
|
|
39
43
|
end
|
40
44
|
|
41
45
|
def call(severity, datetime, progname, msg)
|
42
|
-
|
43
|
-
|
44
|
-
else
|
45
|
-
out = "%s\n" % [msg2str(msg)]
|
46
|
-
end
|
47
|
-
|
48
|
-
@buffer << LogEntity.new(severity, datetime, progname, msg, indent_depth)
|
46
|
+
out = formatted_message(severity, datetime, progname, msg)
|
47
|
+
@buffer << LogEntity.new(severity, datetime, progname, msg, indent_depth, self)
|
49
48
|
|
50
49
|
if colored
|
51
50
|
colorize(out, severity)
|
@@ -83,6 +82,27 @@ module Rundock
|
|
83
82
|
ret
|
84
83
|
end
|
85
84
|
|
85
|
+
def formatted_message(severity, datetime, progname, msg)
|
86
|
+
if !@show_header
|
87
|
+
out = "%s\n" % [msg2str(msg)]
|
88
|
+
elsif !@date_header
|
89
|
+
out = "%5s: %s%s\n" % [
|
90
|
+
severity,
|
91
|
+
' ' * 2 * indent_depth,
|
92
|
+
msg2str(msg)]
|
93
|
+
elsif @short_header
|
94
|
+
out = "%s: %s%s\n" % [severity[0, 1], ' ' * 2 * indent_depth, msg2str(msg)]
|
95
|
+
else
|
96
|
+
out = "[%s] %5s: %s%s\n" % [
|
97
|
+
datetime.strftime('%Y-%m-%dT%H:%M:%S.%L'),
|
98
|
+
severity,
|
99
|
+
' ' * 2 * indent_depth,
|
100
|
+
msg2str(msg)]
|
101
|
+
end
|
102
|
+
|
103
|
+
out
|
104
|
+
end
|
105
|
+
|
86
106
|
private
|
87
107
|
|
88
108
|
def msg2str(msg)
|
@@ -36,7 +36,7 @@ module Rundock
|
|
36
36
|
file = ::File.open(@contents[:filepath], 'w')
|
37
37
|
file.puts("[hookname:#{@name} node:#{operation_attributes[0][:nodename]}]")
|
38
38
|
log_buffer.each do |log|
|
39
|
-
file.puts(
|
39
|
+
file.puts(log.formatted_message)
|
40
40
|
end
|
41
41
|
file.close
|
42
42
|
end
|
data/lib/rundock/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rundock
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.15
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- hiracy
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-09-01 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|