Skip to content

Commit

Permalink
Added plone.app.async with multi_db in prod
Browse files Browse the repository at this point in the history
  • Loading branch information
sgeulette committed Nov 8, 2018
1 parent 82b202e commit 59a6e97
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 1 deletion.
4 changes: 3 additions & 1 deletion port.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@ instance1-http = 8081
instance2-http = 8082
instance3-http = 8083
instance4-http = 8084
instance-debug-http = 8089
instance-amqp-http = 8085
instance-async-http = 8086
instance-debug-http = 8089
zeo = 8080
zeo-monitor = 8180
instance1-monitor = 8181
instance2-monitor = 8182
instance3-monitor = 8183
instance4-monitor = 8184
instance-amqp-monitor = 8185
instance-async-monitor = 8186
instance-debug-monitor = 8189
plone-path =
admin-password = admin
Expand Down
24 changes: 24 additions & 0 deletions prod.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ parts +=
instance3
instance4
instance-amqp
instance-async
upgrade

[facts]
Expand All @@ -24,6 +25,7 @@ zeo-conf-additional =
%define FILESTORAGE ${buildout:directory}/var/filestorage
%define BLOBSTORAGE ${buildout:directory}/var/blobstorage
%include ${buildout:directory}/zeo_add.conf
%include ${buildout:directory}/zeo_async.conf

[zope-conf]
additional =
Expand All @@ -32,6 +34,7 @@ additional =
%define ZEOINSTANCE ${buildout:directory}/parts/zeoserver/var
%define BLOBSTORAGE ${buildout:directory}/var/blobstorage
%include ${buildout:directory}/zope_add_zeo.conf
%include ${buildout:directory}/zope_add_async.conf
${zope-conf:zamqp}

[instance1]
Expand All @@ -41,11 +44,14 @@ zeo-address = ${zeoserver:zeo-address}
zodb-cache-size = ${port:zodb-cache-size}
zeo-client-cache-size = ${port:zeo-client-cache-size}
shared-blob = on
eggs += plone.app.async
zope-conf-additional =
<product-config five.z2monitor>
bind 0.0.0.0:${port:instance1-monitor}
</product-config>
${zope-conf:additional}
zcml-additional =
<include package="plone.app.async" file="multi_db_instance.zcml" />
event-log-custom =
<syslog>
address logs.imio.be:5544
Expand All @@ -60,6 +66,7 @@ event-log-custom =
</logfile>
environment-vars +=
PTS_LANGUAGES fr
ZC_ASYNC_UUID ${buildout:directory}/var/uuid-instance.txt
zope_i18n_allowed_languages fr

[instance2]
Expand Down Expand Up @@ -124,5 +131,22 @@ zope-conf-additional =
${zope-conf:additional}
${zope-conf:amqp}

[instance-async]
<= instance1
eggs =
${instance1:eggs}
zcml =
${instance1:zcml}
http-address = ${port:instance-async-http}
zope-conf-additional =
<product-config five.z2monitor>
bind 0.0.0.0:${port:instance-async-monitor}
</product-config>
${zope-conf:additional}
zcml-additional =
<include package="plone.app.async" file="multi_db_worker.zcml" />
environment-vars =
ZC_ASYNC_UUID ${buildout:directory}/var/uuid-async.txt

[standard]
zeoserver = zeoserver
11 changes: 11 additions & 0 deletions versions-base.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,17 @@ skimpyGimpy = 1.4
appy = 0.9.12
phonenumbers = 8.9.10

# Required by:
# instance-async
plone.app.async = 1.6
Twisted = 8.2.0
uuid = 1.30
zc.async = 1.5.4
zc.dict = 1.2.1
zc.queue = 1.3
zc.twist = 1.3.1
zope.bforest = 1.2

# Required by:
# ftw.labels==1.3.1.dev0
z3c.json = 0.5.5
Expand Down
5 changes: 5 additions & 0 deletions zeo_async.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Needed by plone.app.async

<filestorage async>
path $FILESTORAGE/async.fs
</filestorage>
15 changes: 15 additions & 0 deletions zope_add_async.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Needed by plone.app.async

<zodb_db async>
# cache-size
<zeoclient>
blob-dir $BLOBSTORAGE
shared-blob-dir on
server $ZEOADDRESS
storage async
name async_zeostorage
var $ZEOINSTANCE/var
cache-size 300MB
</zeoclient>
mount-point /async
</zodb_db>

0 comments on commit 59a6e97

Please sign in to comment.