Backups/multi-user
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '76-handle-services-timeout-error' into 'develop'

Browse Source 
Resolve "Handle services timeout error"

See merge request slumber/multi-user!29
This commit is contained in:
Swann Martinez
2020-03-20 12:43:41 +00:00
parent 931301074e ba9b4ebe70
commit 8d2755060e
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
multi_user/libs/replication

Submodule multi_user/libs/replication updated: 2e84bb65b8...114b2ebe37

8
multi_user/ui.py
View File

@ -6,7 +6,8 @@ from .libs.replication.replication.constants import (ADDED, ERROR, FETCHED,
STATE_ACTIVE, STATE_AUTH, STATE_ACTIVE, STATE_AUTH,
STATE_CONFIG, STATE_SYNCING, STATE_CONFIG, STATE_SYNCING,
STATE_INITIAL, STATE_SRV_SYNC, STATE_INITIAL, STATE_SRV_SYNC,
STATE_WAITING, STATE_QUITTING) STATE_WAITING, STATE_QUITTING,
STATE_LAUNCHING_SERVICES)
ICONS_PROP_STATES = ['TRIA_DOWN', # ADDED ICONS_PROP_STATES = ['TRIA_DOWN', # ADDED
'TRIA_UP', # COMMITED 'TRIA_UP', # COMMITED
@ -35,7 +36,7 @@ def printProgressBar (iteration, total, prefix = '', suffix = '', decimals = 1,
return '{} |{}| {}/{}{}'.format(prefix, bar, iteration,total, suffix) return '{} |{}| {}/{}{}'.format(prefix, bar, iteration,total, suffix)
def get_state_str(state): def get_state_str(state):
state_str = 'None' state_str = 'UNKNOWN'
if state == STATE_WAITING: if state == STATE_WAITING:
state_str = 'WARMING UP DATA' state_str = 'WARMING UP DATA'
elif state == STATE_SYNCING: elif state == STATE_SYNCING:
@ -52,6 +53,9 @@ def get_state_str(state):
state_str = 'INIT' state_str = 'INIT'
elif state == STATE_QUITTING: elif state == STATE_QUITTING:
state_str = 'QUITTING SESSION' state_str = 'QUITTING SESSION'
elif state == STATE_LAUNCHING_SERVICES:
state_str = 'LAUNCHING SERVICES'
return state_str return state_str
class SESSION_PT_settings(bpy.types.Panel): class SESSION_PT_settings(bpy.types.Panel):