Skip to content

Modify error handling #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kdienes wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Modify error handling #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81cc38f
Add error message when returning from unrecognized object
Apr 29, 2023
55bee12
Avoid error if there is no sync_owner property
Apr 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions entanglement/protocol/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ def _handle_receive(self, sync_repr, flags):
try:
self._handle_meta(sync_repr, flags)
if '_sync_type' not in sync_repr: # metadata only
logger.error(f'unrecognized message: {sync_repr}')
return
response_for = None
if flags&_MSG_FLAG_RESPONSE_NEEDED:
Expand Down
7 changes: 4 additions & 3 deletions entanglement/sql/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,11 +585,12 @@ def sync_owner_id(self):

@property
def _sync_owner(self):
return self.sync_owner.id
return self.sync_owner and self.sync_owner.id

@_sync_owner.setter
def _sync_owner(self, val):
if val !=self._sync_owner:
raise ValueError('Cannot Change sync_owner this way')
if val != self._sync_owner:
raise ValueError('Cannot change sync_owner this way')

_sync_owner:GUID = interface.sync_property(_sync_owner)

Expand Down