github/supysonic
1
0
Fork 0
mirror of https://github.com/spl0k/supysonic.git synced 2024-09-19 19:01:03 +00:00
Code Issues Releases Wiki Activity

Work around race when creating ClientPrefs

Browse Source 
Closes #220
This commit is contained in:
Alban Féron 2021-09-11 16:21:04 +02:00
parent aea8ebeb13
commit e6e20d1669
No known key found for this signature in database
GPG Key ID: 8CE0313646D16165
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
supysonic/api/__init__.py
View File

@ -11,7 +11,7 @@ import binascii
import uuid
from flask import request
from flask import Blueprint
from pony.orm import ObjectNotFound
from pony.orm import ObjectNotFound, TransactionIntegrityError
from pony.orm import commit
from ..db import ClientPrefs, Folder
@ -83,8 +83,15 @@ def get_client_prefs():
try:
request.client = ClientPrefs[request.user, client]
except ObjectNotFound:
request.client = ClientPrefs(user=request.user, client_name=client)
commit()
try:
request.client = ClientPrefs(user=request.user, client_name=client)
commit()
except TransactionIntegrityError:
# We might have hit a race condition here, another request already created
# the ClientPrefs. Issue #220
# Reload the user or Pony will complain about different transactions
request.user = UserManager.get(request.user.id)
request.client = ClientPrefs[request.user, client]
def get_entity(cls, param="id"):