Commit 4cb1fcc0 authored by Julien Muchembled's avatar Julien Muchembled

fixup! NEO: fix log rotation

This fixes the following error:

    slapos-kill: error: unrecognized arguments: -l /srv/slapgrid/slappart38/var/log/neostorage-0.log
parent c3794124
...@@ -25,7 +25,7 @@ path = ${directory:promises}/neo-admin-promise ...@@ -25,7 +25,7 @@ path = ${directory:promises}/neo-admin-promise
< = logrotate-entry-base < = logrotate-entry-base
name = neo-admin name = neo-admin
log = ${neo-admin:logfile} log = ${neo-admin:logfile}
post = {{ bin_directory }}/slapos-kill -s RTMIN+1 ${neo-admin:binary} -l ${:log} post = {{ bin_directory }}/slapos-kill -s RTMIN+1 -- ${neo-admin:binary} -l ${:log}
[neoctl] [neoctl]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
......
...@@ -33,4 +33,4 @@ path = ${directory:promises}/neo-master-promise ...@@ -33,4 +33,4 @@ path = ${directory:promises}/neo-master-promise
< = logrotate-entry-base < = logrotate-entry-base
name = neo-master name = neo-master
log = ${neo-master:logfile} log = ${neo-master:logfile}
post = {{ bin_directory }}/slapos-kill -s RTMIN+1 ${neo-master:binary} -l ${:log} post = {{ bin_directory }}/slapos-kill -s RTMIN+1 -- ${neo-master:binary} -l ${:log}
...@@ -101,7 +101,7 @@ database-parameters = root@neo{{ i }}${my-cnf-parameters:socket} ...@@ -101,7 +101,7 @@ database-parameters = root@neo{{ i }}${my-cnf-parameters:socket}
< = logrotate-entry-base < = logrotate-entry-base
name = {{ storage_id }} name = {{ storage_id }}
log = {{ '${' + storage_id + ':logfile}' }} log = {{ '${' + storage_id + ':logfile}' }}
post = {{ bin_directory }}/slapos-kill -s RTMIN+1 {{ bin_directory }}/neostorage -l ${:log} post = {{ bin_directory }}/slapos-kill -s RTMIN+1 -- {{ bin_directory }}/neostorage -l ${:log}
{% endfor -%} {% endfor -%}
[init-script] [init-script]
......
...@@ -91,15 +91,15 @@ md5sum = f3259726bd5d824c569dc7db6b7d26a0 ...@@ -91,15 +91,15 @@ md5sum = f3259726bd5d824c569dc7db6b7d26a0
[instance-neo-admin] [instance-neo-admin]
<= download-base-neo <= download-base-neo
md5sum = 6400c42696d79c3ffee0069cc1a1d424 md5sum = f671bb5bbb006d6bcecee8c7814bee57
[instance-neo-master] [instance-neo-master]
<= download-base-neo <= download-base-neo
md5sum = 13c3cb57b29267bc3c4d1cf687fe8eb3 md5sum = 1fee10f02c2fa2a581e21878ca0fd704
[instance-neo-storage-mysql] [instance-neo-storage-mysql]
<= download-base-neo <= download-base-neo
md5sum = 4d4165291634ea9e6ea640d60858f640 md5sum = 836ae32d4b6d502d0a597cb28ebf7616
[template-neo-my-cnf] [template-neo-my-cnf]
<= download-base-neo <= download-base-neo
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment