Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
slapos
Commits
61598b5e
Commit
61598b5e
authored
May 10, 2017
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NEO: fix log rotation
It was not working with wrappers to work around shebang length limitation.
parent
0c7344b2
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
7 deletions
+8
-7
slapos/recipe/neoppod.py
slapos/recipe/neoppod.py
+1
-0
software/neoppod/instance-neo-admin.cfg.in
software/neoppod/instance-neo-admin.cfg.in
+2
-2
software/neoppod/instance-neo-master.cfg.in
software/neoppod/instance-neo-master.cfg.in
+1
-1
software/neoppod/instance-neo-storage-mysql.cfg.in
software/neoppod/instance-neo-storage-mysql.cfg.in
+1
-1
software/neoppod/software-common.cfg
software/neoppod/software-common.cfg
+3
-3
No files found.
slapos/recipe/neoppod.py
View file @
61598b5e
...
@@ -43,6 +43,7 @@ class NeoBaseRecipe(GenericBaseRecipe):
...
@@ -43,6 +43,7 @@ class NeoBaseRecipe(GenericBaseRecipe):
# useful, as per NEO deploying constraints.
# useful, as per NEO deploying constraints.
raise
UserError
(
'"masters" parameter is mandatory'
)
raise
UserError
(
'"masters" parameter is mandatory'
)
option_list
=
[
option_list
=
[
# Keep the -l option first, as expected by logrotate snippets.
'-l'
,
options
[
'logfile'
],
'-l'
,
options
[
'logfile'
],
'-m'
,
options
[
'masters'
],
'-m'
,
options
[
'masters'
],
'-b'
,
self
.
_getBindingAddress
(),
'-b'
,
self
.
_getBindingAddress
(),
...
...
software/neoppod/instance-neo-admin.cfg.in
View file @
61598b5e
...
@@ -25,12 +25,12 @@ path = ${directory:promises}/neo-admin-promise
...
@@ -25,12 +25,12 @@ 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 -
n neoadmin -s RTMIN+1
${:log}
post = {{ bin_directory }}/slapos-kill -
s RTMIN+1 ${neo-admin:binary} -l
${:log}
[neoctl]
[neoctl]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
command-line =
command-line =
{{bin_directory}}/neoctl -a ${neo-admin:ip}:${neo-admin:port}
{{bin_directory}}/neoctl -a ${neo-admin:ip}:${neo-admin:port}
{%- if slapparameter_dict['ssl'] %}
{%- if slapparameter_dict['ssl'] %}
--ca ${directory:etc}/ca.crt
--ca ${directory:etc}/ca.crt
--cert ${directory:etc}/neo.crt
--cert ${directory:etc}/neo.crt
...
...
software/neoppod/instance-neo-master.cfg.in
View file @
61598b5e
...
@@ -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 -
n neomaster -s RTMIN+1
${:log}
post = {{ bin_directory }}/slapos-kill -
s RTMIN+1 ${neo-master:binary} -l
${:log}
software/neoppod/instance-neo-storage-mysql.cfg.in
View file @
61598b5e
...
@@ -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 -
n neostorage -s RTMIN+1
${:log}
post = {{ bin_directory }}/slapos-kill -
s RTMIN+1 ${neo-storage:binary} -l
${:log}
{% endfor -%}
{% endfor -%}
[init-script]
[init-script]
...
...
software/neoppod/software-common.cfg
View file @
61598b5e
...
@@ -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 =
d5eb14e3d83d7787950de913d7e29aad
md5sum =
6400c42696d79c3ffee0069cc1a1d424
[instance-neo-master]
[instance-neo-master]
<= download-base-neo
<= download-base-neo
md5sum =
c6e0db7344a26a55580102e3cc33c984
md5sum =
13c3cb57b29267bc3c4d1cf687fe8eb3
[instance-neo-storage-mysql]
[instance-neo-storage-mysql]
<= download-base-neo
<= download-base-neo
md5sum =
c1cdb4289ff458545de15aca65121b80
md5sum =
7de8b69684a15692c38f2926821e3d18
[template-neo-my-cnf]
[template-neo-my-cnf]
<= download-base-neo
<= download-base-neo
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment