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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Titouan Soulard
slapos
Commits
d0aa4805
Commit
d0aa4805
authored
Sep 02, 2013
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5: fix ZEO servers with multiple storages due to wrong reuse of mutable
parent
cf4b2a73
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+1
-1
stack/erp5/instance-zeo.cfg.in
stack/erp5/instance-zeo.cfg.in
+6
-4
No files found.
stack/erp5/buildout.cfg
View file @
d0aa4805
...
@@ -279,7 +279,7 @@ md5sum = 7735d535aa34dfdc18a776b80bc0ca3d
...
@@ -279,7 +279,7 @@ md5sum = 7735d535aa34dfdc18a776b80bc0ca3d
[template-zeo]
[template-zeo]
< = download-base
< = download-base
filename = instance-zeo.cfg.in
filename = instance-zeo.cfg.in
md5sum =
ae4560ecbd748de5a1e0b10932d9be05
md5sum =
6d6665595c08883c4f075dd3d176dc02
[template-zope]
[template-zope]
< = download-base
< = download-base
...
...
stack/erp5/instance-zeo.cfg.in
View file @
d0aa4805
...
@@ -56,10 +56,9 @@ ipv6 = {{ ipv6 }}
...
@@ -56,10 +56,9 @@ ipv6 = {{ ipv6 }}
{% endfor -%}
{% endfor -%}
{% for storage_family, export_list in storage_dict.items() -%}
{% for storage_family, export_list in storage_dict.items() -%}
{% set known_tid_storage_identifier_host = ((ipv4, next_port), ) -%}
{% set known_tid_storage_identifier_host = ((ipv4, next_port), ) -%}
{% set client_dict = {} -%}
{% for export_id, mount_point, cache_size, export_storage_dict in export_list -%}
{% for export_id, mount_point, cache_size, export_storage_dict in export_list -%}
{% do export_storage_dict.__setitem__('path', export_storage_dict.get('path', '%(zodb)s/%(name)s.fs') % {'zodb': default_zodb_path, 'name': export_id}) -%}
{% do export_storage_dict.__setitem__('path', export_storage_dict.get('path', '%(zodb)s/%(name)s.fs') % {'zodb': default_zodb_path, 'name': export_id}) -%}
{%
do client_dict.update(export_storage_dict.get('client', {})
) -%}
{%
set client_dict = export_storage_dict.get('client', {}).copy(
) -%}
{% do client_dict.__setitem__('storage', export_id) -%}
{% do client_dict.__setitem__('storage', export_id) -%}
{# XXX: I would like to raise if export_id is present in zodb_dict -#}
{# XXX: I would like to raise if export_id is present in zodb_dict -#}
{% do zodb_dict.__setitem__(export_id, [
{% do zodb_dict.__setitem__(export_id, [
...
@@ -101,7 +100,7 @@ port = {{ next_port }}
...
@@ -101,7 +100,7 @@ port = {{ next_port }}
path = ${directory:promises}/zeo-{{ storage_family }}
path = ${directory:promises}/zeo-{{ storage_family }}
{% if use_ipv6 -%}
{% if use_ipv6 -%}
{%
do client_dict.__setitem__('server', '[' ~ ipv6 ~ ']:' ~ next_port)
-%}
{%
set address = '[' ~ ipv6 ~ ']:' ~ next_port
-%}
{% set tunnel_section_name = zeo_section_name ~ "-tunnel" -%}
{% set tunnel_section_name = zeo_section_name ~ "-tunnel" -%}
[{{ tunnel_section_name }}]
[{{ tunnel_section_name }}]
< = ipv6toipv4-base
< = ipv6toipv4-base
...
@@ -115,8 +114,11 @@ hostname = {{ "${" ~ tunnel_section_name ~ ":ipv6}" }}
...
@@ -115,8 +114,11 @@ hostname = {{ "${" ~ tunnel_section_name ~ ":ipv6}" }}
port = {{ next_port }}
port = {{ next_port }}
path = ${directory:promises}/zeo-tunnel-{{ storage_family }}
path = ${directory:promises}/zeo-tunnel-{{ storage_family }}
{% else -%}
{% else -%}
{%
do client_dict.__setitem__('server', ipv4 ~ ':' ~ next_port)
-%}
{%
set address = ipv4 ~ ':' ~ next_port
-%}
{% endif -%}
{% endif -%}
{% for export in export_list -%}
{% do zodb_dict[export[0]][2].__setitem__('server', address) -%}
{% endfor -%}
{% set next_port = next_port + 1 -%}
{% set next_port = next_port + 1 -%}
{% endfor -%}
{% endfor -%}
...
...
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