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

Merge branch 'develop' into 235-show-color-in-connected-user-pannel

Browse Source
This commit is contained in:
Swann 2021-11-17 16:19:03 +01:00
commit 189e5c6cf1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
multi_user/libs/replication

@ -1 +1 @@
Subproject commit d69f25904664088c946f0fdfd27b3d8a630c7a83 Subproject commit 9aa015bd692e5c4851034665301cda7e2835a7d9

9
multi_user/timers.py
View File

@ -203,10 +203,11 @@ class DynamicRightSelectTimer(Timer):
for node_id in to_lock: for node_id in to_lock:
node = session.repository.graph.get(node_id) node = session.repository.graph.get(node_id)
instance_mode = node.data.get('instance_type') if node and hasattr(node,'data'):
if instance_mode and instance_mode == 'COLLECTION': instance_mode = node.data.get('instance_type')
to_lock.remove(node_id) if instance_mode and instance_mode == 'COLLECTION':
instances_to_lock.append(node_id) to_lock.remove(node_id)
instances_to_lock.append(node_id)
if instances_to_lock: if instances_to_lock:
try: try:
porcelain.lock(session.repository, porcelain.lock(session.repository,