Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
141
Merge Requests
141
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
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
f7b7edb6
Commit
f7b7edb6
authored
Feb 17, 2023
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CMFActivity: support Zope4 ZMI
parent
e0ef4064
Pipeline
#29966
failed with stage
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
42 additions
and
36 deletions
+42
-36
product/CMFActivity/dtml/manageActivities.dtml
product/CMFActivity/dtml/manageActivities.dtml
+32
-30
product/CMFActivity/dtml/manageActivitiesAdvanced.dtml
product/CMFActivity/dtml/manageActivitiesAdvanced.dtml
+3
-1
product/CMFActivity/dtml/manageLoadBalancing.dtml
product/CMFActivity/dtml/manageLoadBalancing.dtml
+7
-5
No files found.
product/CMFActivity/dtml/manageActivities.dtml
View file @
f7b7edb6
...
...
@@ -29,63 +29,65 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<dtml-var manage_page_header>
<dtml-var manage_tabs>
<main class="container-fluid">
<h3>Queued Activities</h3>
<dtml-let show_cancel_and_invoke_links="not isCancelAndInvokeLinksHidden()">
<dtml-if show_cancel_and_invoke_links>
<p>Warning: Invoking or canceling activities will invoke/cancel all activities with both the same path and the same method_id.</p>
<p>Warning: Invoking an activity will <b>not</b> run any dependency check.</p>
<p
class="lead"
>Warning: Invoking or canceling activities will invoke/cancel all activities with both the same path and the same method_id.</p>
<p
class="lead"
>Warning: Invoking an activity will <b>not</b> run any dependency check.</p>
</dtml-if>
<table c
ellspacing="0" cellpadding="2" border="1">
<table c
lass="table table-striped table-hover table-sm"
<tr>
<dtml-if show_cancel_and_invoke_links>
<th
align="left" valign="top"
></th>
<th></th>
</dtml-if>
<th
align="left" valign="top"
>Uid</th>
<th
align="left" valign="top"
>Object</th>
<th
align="left" valign="top"
>Method Id</th>
<th
align="left" valign="top"
>Activity Kw</th>
<th
align="left" valign="top"
>Arguments</th>
<th
align="left" valign="top"
>Named Parameters</th>
<th
align="left" valign="top"
>Processing Node</th>
<th
align="left" valign="top"
>Retry</th>
<th
align="left" valign="top"
>Call Traceback</th>
<th>Uid</th>
<th>Object</th>
<th>Method Id</th>
<th>Activity Kw</th>
<th>Arguments</th>
<th>Named Parameters</th>
<th>Processing Node</th>
<th>Retry</th>
<th>Call Traceback</th>
</tr>
<dtml-in expr="getMessageList()">
<dtml-let path="'/'.join(object_path)">
<tr>
<dtml-if show_cancel_and_invoke_links>
<td
align="left" valign="top"
>
<a href="manageCancel?object_path=&dtml-path;&method_id=&dtml-method_id;">Cancel</a>
<a href="manageInvoke?object_path=&dtml-path;&method_id=&dtml-method_id;">Invoke</a>
<td>
<a
class="btn btn-danger"
href="manageCancel?object_path=&dtml-path;&method_id=&dtml-method_id;">Cancel</a>
<a
class="btn btn-warning"
href="manageInvoke?object_path=&dtml-path;&method_id=&dtml-method_id;">Invoke</a>
</td>
</dtml-if>
<td
align="left" valign="top"
><dtml-var uid>
<td><dtml-var uid>
<dtml-var expr="{'SQLDict':'(dict)','SQLQueue':'(queue)','SQLJoblib':'(Joblib)'}[activity]">
</td>
<td
align="left" valign="top"><a href="<dtml-var expr="REQUEST.physicalPathToURL(path)">"><dtml-var path></a
></td>
<td
align="left" valign="top"><dtml-var method_id
></td>
<td
align="left" valign="top"
>
<dtml-if activity_kw><
dtml-var expr="_.repr(activity_kw)[1:-1]" html_quote
>
<td
><code><a href="<dtml-var expr="REQUEST.physicalPathToURL(path)">"><dtml-var path></a></code
></td>
<td
><code><dtml-var method_id></code
></td>
<td>
<dtml-if activity_kw><
small><pre><dtml-var expr="_.repr(activity_kw)[1:-1]" html_quote></pre></small
>
<dtml-else>
</dtml-if>
</td>
<td
align="left" valign="top"
>
<dtml-if args><
dtml-var expr="_.repr(_.list(args))[1:-1]" html_quote
>
<td>
<dtml-if args><
small><pre><dtml-var expr="_.repr(_.list(args))[1:-1]" html_quote></pre></small
>
<dtml-else>
</dtml-if>
</td>
<td
align="left" valign="top"
>
<dtml-if kw><
dtml-var expr="_.repr(kw)[1:-1]" html_quote
>
<td>
<dtml-if kw><
small><pre><dtml-var expr="_.repr(kw)[1:-1]" html_quote></pre></small
>
<dtml-else>
</dtml-if>
</td>
<td
align="left" valign="top"
><dtml-var processing_node></td>
<td
align="left" valign="top"
><dtml-var retry></td>
<td
align="left" valign="top"
>
<td><dtml-var processing_node></td>
<td><dtml-var retry></td>
<td>
<dtml-if expr="call_traceback is not None">
<
pre><dtml-var call_traceback></pre
>
<
small><pre><dtml-var call_traceback></pre></small
>
</dtml-if>
</td>
</tr>
...
...
@@ -93,5 +95,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
</dtml-in>
</table>
</dtml-let>
</main>
<dtml-var manage_page_footer>
product/CMFActivity/dtml/manageActivitiesAdvanced.dtml
View file @
f7b7edb6
<dtml-var manage_page_header>
<dtml-var manage_tabs>
<br />
<main class="container-fluid">
<form action="&dtml-URL1;">
<table width="100%" cellspacing="0" cellpadding="2" border="0">
<tr class="section-bar">
...
...
@@ -124,4 +125,5 @@
</td>
</tr>
</table>
</main>
<dtml-var manage_page_footer>
product/CMFActivity/dtml/manageLoadBalancing.dtml
View file @
f7b7edb6
...
...
@@ -28,8 +28,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<dtml-var manage_page_header>
<dtml-var manage_tabs>
<main class="container-fluid">
<p class="form-help">
<p class="form-help
leap
">
This tab defines the Load Balancing of Activities.
To provide high performance, the activities are distributed over several ZEO clients, called <i>nodes</i>,
so that they can be processed in parallel. Nodes can either run on different machines or on one machine
...
...
@@ -38,7 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<code>IP-Address</code>:<code>Port-Number</code>.
</p>
<p class="form-help">
<p class="form-help
leap
">
The interval of distribution and activation of the activities is per default 5 seconds. This can be
changed by altering the value of <i>interval</i> in the section <i>time-server</i> in the
Zope Configuration File <i>zope.conf</i>.
...
...
@@ -193,13 +194,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
</table>
</td>
<td>
<p class="form-help">
<p class="form-help
leap
">
Every node sharing the same ZODB will register itself to the idle
node list - except the first one which will be automatically declared
both <i>Processing node</i> and <i>Distributing node</i>. Registered
nodes can then be made <i>Processing nodes</i> or <i>Idle nodes</i>.
</p>
<p class="form-help">
<p class="form-help
leap
">
<b>Important note:</b> Nodes can register themselves, but can not
unregister themselves (for example, a node which IP has changed will
be present twice in the list). It is up to the user to manually prune
...
...
@@ -207,7 +208,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<i>Processing node</i> list, activities will get balanced to those
nodes and never be executed.
</p>
<p class="form-help">
<p class="form-help
leap
">
<b>Important note:</b>Adding or removing processing nodes while
activities are processed causes undefined behaviour.
</p>
...
...
@@ -288,4 +289,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
</tr>
</table>
</form>
</main>
<dtml-var manage_page_footer>
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