luban-fluentd 0.1.3 → 0.1.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGLOG.md +6 -0
- data/lib/luban/deployment/applications/fluentd/controller.rb +2 -10
- data/lib/luban/deployment/applications/fluentd/templates/fluentd.monitrc.erb +2 -2
- data/lib/luban/deployment/applications/fluentd/version.rb +1 -1
- data/luban-fluentd.gemspec +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 276270dbd85057b1ccb400d6530531dcfa77dc28
|
4
|
+
data.tar.gz: b26f31768828c66f702bdd4b2d214f13bbce278a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7a8c57a59703beef53ee73764cb5bf32433ad48f388ae206f7803e8bc66230f78f8bdf8addfe0ebd6834b69fe028e3915d58861317295a7ca4bceca5a39e2914
|
7
|
+
data.tar.gz: 914ca49bf505de15a6dcbdbced31e72bb0f5dd8ed1e626cac336e202a3d6777918c065d84a4707000c2b1b553c2fb8880ac9e8ad87258f05ae6b5ef435716dc2
|
data/CHANGLOG.md
CHANGED
@@ -1,5 +1,11 @@
|
|
1
1
|
# Change log
|
2
2
|
|
3
|
+
## Version 0.1.4 (Sept 20, 2016)
|
4
|
+
|
5
|
+
Minor enhancements:
|
6
|
+
* Refactored the way of composing shell commands
|
7
|
+
* As a result, bumped up the gem dependency on Luban to version 0.8.0
|
8
|
+
|
3
9
|
## Version 0.1.3 (Sept 04, 2016)
|
4
10
|
|
5
11
|
Minor enhancements:
|
@@ -4,24 +4,16 @@ module Luban
|
|
4
4
|
class Fluentd
|
5
5
|
class Controller < Luban::Deployment::Application::Controller
|
6
6
|
module Commands
|
7
|
-
def ruby_bin_path
|
8
|
-
@ruby_bin_path ||= package_bin_path('ruby')
|
9
|
-
end
|
10
|
-
|
11
|
-
def bundle_executable
|
12
|
-
@bundle_executable ||= ruby_bin_path.join('bundle')
|
13
|
-
end
|
14
|
-
|
15
7
|
def process_pattern
|
16
8
|
@process_pattern ||= "^supervisor:#{env_name}"
|
17
9
|
end
|
18
10
|
|
19
11
|
def start_command
|
20
|
-
@start_command ||= "
|
12
|
+
@start_command ||= bundle_command("fluentd -c #{control_file_path} -d #{pid_file_path} -o #{log_file_path}")
|
21
13
|
end
|
22
14
|
|
23
15
|
def stop_command
|
24
|
-
@stop_command ||= "kill $(cat #{pid_file_path} 2>/dev/null)"
|
16
|
+
@stop_command ||= shell_command("kill $(cat #{pid_file_path} 2>/dev/null)")
|
25
17
|
end
|
26
18
|
end
|
27
19
|
|
@@ -3,8 +3,8 @@
|
|
3
3
|
check process <%= service_entry %>
|
4
4
|
with pidfile <%= pid_file_path %>
|
5
5
|
onreboot laststate
|
6
|
-
start program = "/bin/bash -c 'sleep 1; <%=
|
7
|
-
stop program = "/bin/bash -c '<%=
|
6
|
+
start program = "/bin/bash -c 'sleep 1; <%= start_command %>; sleep 5'"
|
7
|
+
stop program = "/bin/bash -c '<%= stop_command %>'"
|
8
8
|
if totalmem is greater than 50.0 MB for 40 cycles then restart
|
9
9
|
if failed port <%= port %> for 4 times within 8 cycles then restart
|
10
10
|
if cpu is greater than 80% for 20 cycles then alert
|
data/luban-fluentd.gemspec
CHANGED
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
|
|
20
20
|
spec.require_paths = ["lib"]
|
21
21
|
|
22
22
|
spec.required_ruby_version = ">= 2.1.0"
|
23
|
-
spec.add_dependency 'luban', ">= 0.
|
23
|
+
spec.add_dependency 'luban', ">= 0.8.0"
|
24
24
|
|
25
25
|
spec.add_development_dependency "bundler", "~> 1.12"
|
26
26
|
spec.add_development_dependency "rake", "~> 10.0"
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: luban-fluentd
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Rubyist Chi
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-09-
|
11
|
+
date: 2016-09-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: luban
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - ">="
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 0.
|
19
|
+
version: 0.8.0
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - ">="
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 0.
|
26
|
+
version: 0.8.0
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: bundler
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|