amiral 0.1.3 → 0.1.4
Sign up to get free protection for your applications and to get access to all the features.
- data/amiral.gemspec +0 -1
- data/bin/amiral.rb +3 -9
- data/lib/amiral/version.rb +1 -1
- data/lib/amiral.rb +6 -15
- metadata +1 -17
data/amiral.gemspec
CHANGED
data/bin/amiral.rb
CHANGED
@@ -15,8 +15,6 @@ options.logfile = "amiral.log"
|
|
15
15
|
options.host = "localhost"
|
16
16
|
options.port = 6379
|
17
17
|
options.match_spec = {:all => true}
|
18
|
-
options.foreground = false
|
19
|
-
options.rundir = "."
|
20
18
|
options.loglevel = Logger::INFO
|
21
19
|
|
22
20
|
opts = OptionParser.new do |opts|
|
@@ -35,7 +33,7 @@ opts = OptionParser.new do |opts|
|
|
35
33
|
end
|
36
34
|
end
|
37
35
|
|
38
|
-
opts.on("-
|
36
|
+
opts.on("-L", "--log-level [level]", String, "log level") do |level|
|
39
37
|
case level
|
40
38
|
when "debug"
|
41
39
|
options.loglevel = Logger::DEBUG
|
@@ -72,12 +70,8 @@ opts = OptionParser.new do |opts|
|
|
72
70
|
options.queue_ack = aqueue
|
73
71
|
end
|
74
72
|
|
75
|
-
opts.on("-
|
76
|
-
options.
|
77
|
-
end
|
78
|
-
|
79
|
-
opts.on("-f", "--[no-]foreground") do |foreground|
|
80
|
-
options.foreground = foreground
|
73
|
+
opts.on("-l", "--log [logfile]", String, "log file path") do |logfile|
|
74
|
+
options.logfile = logfile
|
81
75
|
end
|
82
76
|
|
83
77
|
opts.on("-m", "--match [filter]", String, "node match filter") do |matcher|
|
data/lib/amiral/version.rb
CHANGED
data/lib/amiral.rb
CHANGED
@@ -6,7 +6,6 @@ require 'json'
|
|
6
6
|
require 'facter'
|
7
7
|
require 'uuidtools'
|
8
8
|
require 'awesome_print'
|
9
|
-
require 'daemons'
|
10
9
|
require 'logger'
|
11
10
|
require 'popen4'
|
12
11
|
|
@@ -51,13 +50,13 @@ module Amiral
|
|
51
50
|
}
|
52
51
|
short = "unknown status"
|
53
52
|
case status.exitstatus
|
54
|
-
when 0
|
53
|
+
when 0
|
55
54
|
short = "nothing to do, i'm all good"
|
56
|
-
when 2
|
55
|
+
when 2
|
57
56
|
short = "successfully applied changes"
|
58
|
-
when 4
|
57
|
+
when 4
|
59
58
|
short = "encountered catalog application errors"
|
60
|
-
when 6
|
59
|
+
when 6
|
61
60
|
short = "errors encountered, managed to apply some changes"
|
62
61
|
end
|
63
62
|
|
@@ -263,10 +262,10 @@ module Amiral
|
|
263
262
|
:keytype => :dss,
|
264
263
|
:hostname => hostname,
|
265
264
|
:loglevel => Logger::INFO,
|
266
|
-
:
|
265
|
+
:logfile => "amiral.log",
|
267
266
|
}.merge settings
|
268
267
|
|
269
|
-
@logger = Logger.new(
|
268
|
+
@logger = Logger.new(@settings[:logfile])
|
270
269
|
@logger.level = @settings[:loglevel]
|
271
270
|
|
272
271
|
raise "need key path" unless @settings[:keypath]
|
@@ -281,15 +280,7 @@ module Amiral
|
|
281
280
|
|
282
281
|
def run args
|
283
282
|
begin
|
284
|
-
Daemons.daemonize({:backtrace => true,
|
285
|
-
:ontop => @settings[:foreground],
|
286
|
-
:dir_mode => :normal,
|
287
|
-
:dir => @settings[:rundir],
|
288
|
-
:app_name => "amiral-agent",
|
289
|
-
:log_output => true})
|
290
283
|
listen
|
291
|
-
rescue SystemExit => err
|
292
|
-
@logger.debug("agent starting")
|
293
284
|
rescue Exception => err
|
294
285
|
@logger.fatal("caught exception, exiting")
|
295
286
|
@logger.fatal(err)
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: amiral
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.4
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -91,22 +91,6 @@ dependencies:
|
|
91
91
|
- - ! '>='
|
92
92
|
- !ruby/object:Gem::Version
|
93
93
|
version: '0'
|
94
|
-
- !ruby/object:Gem::Dependency
|
95
|
-
name: daemons
|
96
|
-
requirement: !ruby/object:Gem::Requirement
|
97
|
-
none: false
|
98
|
-
requirements:
|
99
|
-
- - ! '>='
|
100
|
-
- !ruby/object:Gem::Version
|
101
|
-
version: '0'
|
102
|
-
type: :runtime
|
103
|
-
prerelease: false
|
104
|
-
version_requirements: !ruby/object:Gem::Requirement
|
105
|
-
none: false
|
106
|
-
requirements:
|
107
|
-
- - ! '>='
|
108
|
-
- !ruby/object:Gem::Version
|
109
|
-
version: '0'
|
110
94
|
- !ruby/object:Gem::Dependency
|
111
95
|
name: popen4
|
112
96
|
requirement: !ruby/object:Gem::Requirement
|