rattail/tailbone
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix initial datasync status display when supervisor error occurs

Browse source
This commit is contained in:
Lance Edgar 2022-08-17 19:06:02 -05:00
parent ed55fbca9e
commit 5fb99c54c9
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tailbone/templates/datasync/status.mako
View file

@ -11,7 +11,7 @@
</%def> </%def>
<%def name="page_content()"> <%def name="page_content()">
% if expose_websockets: % if expose_websockets and not supervisor_error:
<b-notification type="is-warning" <b-notification type="is-warning"
:active="websocketClosed" :active="websocketClosed"
:closable="false"> :closable="false">
@ -21,7 +21,11 @@
<b-field label="Supervisor Status"> <b-field label="Supervisor Status">
<div style="display: flex;"> <div style="display: flex;">
<pre :class="processInfo.statename == 'RUNNING' ? 'has-background-success' : 'has-background-warning'">{{ processDescription }}</pre> % if supervisor_error:
<pre class="has-background-warning">${supervisor_error}</pre>
% else:
<pre :class="(processInfo && processInfo.statename == 'RUNNING') ? 'has-background-success' : 'has-background-warning'">{{ processDescription }}</pre>
% endif
<div style="margin-left: 1rem;"> <div style="margin-left: 1rem;">
% if request.has_perm('datasync.restart'): % if request.has_perm('datasync.restart'):
@ -128,7 +132,7 @@
this.restartingProcess = true this.restartingProcess = true
} }
% if expose_websockets: % if expose_websockets and not supervisor_error:
ThisPageData.ws = null ThisPageData.ws = null
ThisPageData.websocketClosed = false ThisPageData.websocketClosed = false