[gentoo-commits] dev/ultrabug:master commit in: app-admin/consul/files/, app-admin/consul/

[Alexys Jacob]

commit:     ab921f9ae13cce54e329ee1172d422efaf95546a
Author:     Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  3 17:05:25 2014 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Tue Jun  3 17:05:25 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=ab921f9a

consul init script enhancement

---
 app-admin/consul/Manifest                 |  4 ++--
 app-admin/consul/files/consul-agent.confd |  2 +-
 app-admin/consul/files/consul-agent.initd | 20 ++++++++++++++++++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index dbdaaa9..03c2394 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -1,3 +1,3 @@
-AUX consul-agent.confd 101 SHA256 
281d2ee5847409674d1bd00152bd107649cd987a47423a58ebc405fd87720dc9 SHA512 
d33f733b497c07262464c59f9bac7a8312865ab90ec959ccbcba442f799ec740275798e20e938a2d0f316c63eccc72a24cfe8792a13a7ec21e828d08bebe2b62
 WHIRLPOOL 
f29cc61d88754a52a92634bc5b663f5d00c1b596167902ee06122f7703b454410e02ec7cfba21e8aaae1a472ccf44abcd3bc5933ddf06330a7f69418b77f9929
-AUX consul-agent.initd 598 SHA256 
ffeb1d4ec42a9ffbe6d0e1bd5b5051a519f19a5a0d295dd696f45be450fce5c6 SHA512 
5cfaff1c625c509d309b8328623c6ae461ea3a5206123c2cdfc22d76cbde74dcf532b308be1e6ec640d0a46cdfbf361302ffc6a05f7c6e3b3a0e70602ebe0c25
 WHIRLPOOL 
48f8c1b13f7d7c49e912491d1def8b6c19b6a6478574adc5ae7912a055a6a3670083305f81308782feeb40b349f32d4d7ee11184358f9d075ece692b3cdef9c3
+AUX consul-agent.confd 126 SHA256 
f86878f356ba57b9d54f94ff93798b6751833127efa03214ad5afa68a17bb5f2 SHA512 
a6ef9db3ed9a3a6cd1c50ada4e1c2c7cd6e7d3eff44bacc21e3e11d83a764df1d311998d54951afb8a96854a4f80ff8920e21133cb8bbd55cf96f7285fb3bad3
 WHIRLPOOL 
e2e7a64bb3dc983919ac42c5bb221272a666145322ebf6ee2f91b72d8101ea9f90170d41826a683e3d318df0581e89d272e0d51793d845c67094fa274da67fe2
+AUX consul-agent.initd 1008 SHA256 
40218f540661cb2fdc862c52b8c4f5c98a33cea79eca2ae5fdeca6fe844cd4f2 SHA512 
a22b5a943e4b554c9fa310a80bf834dd77a908f322b049807dffe305d6bced03da8930e87e01b8ba6946da403a0ef182bca240071e913b935dac46477a0fe030
 WHIRLPOOL 
443d53c08d7d51f812b8d1fc13be809b17aaf6017559a791587d57fea57225e091d8dd1d28d13f537dbb50c0262f6db4b9c85f5560c95d99d3c5d752f39d7a43
 EBUILD consul-0.2.1.ebuild 1352 SHA256 
ff195f991235f980d00e1a3142e06f249c36c9cdb831cfec07c39db6f22747c3 SHA512 
460f0c3339bcee0d4801534a2175587d2823b12427680a07faad5954f7f0c19b9f3eacace6bc12445d881d43a56c6bacf2daaab4ebca9c01b08c045ca0e0e9e5
 WHIRLPOOL 
dccf7a514b0718cdcaf743c7b551c01b127b79dbfd7611264f7afc253ef196bcf9ac135cff455723526752aef8b3038f9dd80c7021c3e0f12ada83f5f6a4e2a2

diff --git a/app-admin/consul/files/consul-agent.confd 
b/app-admin/consul/files/consul-agent.confd
index 7f8ec86..75df601 100644
--- a/app-admin/consul/files/consul-agent.confd
+++ b/app-admin/consul/files/consul-agent.confd
@@ -1,2 +1,2 @@
 # extra arguments for the consul agent
-command_args="-server -bootstrap -data-dir=/tmp/consul-server"
\ No newline at end of file
+command_args="-server -bootstrap -data-dir=/tmp/consul-agent 
-config-dir=/etc/consul.d"
\ No newline at end of file

diff --git a/app-admin/consul/files/consul-agent.initd 
b/app-admin/consul/files/consul-agent.initd
index f01a376..24d7889 100644
--- a/app-admin/consul/files/consul-agent.initd
+++ b/app-admin/consul/files/consul-agent.initd
@@ -7,18 +7,34 @@ pidfile=${pidfile:-"/run/${SVCNAME}.pid"}
 
 command="/usr/bin/consul"
 command_args="agent ${command_args} -pid-file ${pidfile}"
-start_stop_daemon_args="--background --stdout /var/log/consul/${SVCNAME}.log"
+command_background="true"
+start_stop_daemon_args="--stdout /var/log/consul/${SVCNAME}.log"
 
 description="tool for service discovery, monitoring and configuration."
-extra_started_commands="reload"
+extra_started_commands="reload telemetry"
 
 depend() {
        need hostname
        use net
 }
 
+stop() {
+       # We need to override the default stop function
+       # because it uses SIGTERM whereas consul needs a SIGINT
+       # to shutdown gracefully
+    ebegin "Stopping ${SVCNAME}"
+    start-stop-daemon --signal SIGINT --pidfile "${pidfile}"
+    eend $?
+}
+
 reload() {
        ebegin "Reloading ${SVCNAME}"
        start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
        eend $?
+}
+
+telemetry() {
+    ebegin "Logging telemetry for ${SVCNAME}"
+    start-stop-daemon --signal SIGUSR1 --pidfile "${pidfile}"
+    eend $?
 }
\ No newline at end of file