Skip to content

Add option to omit metadata [ESD-1170] #663

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

Merged
merged 1 commit into from
Mar 15, 2019
Merged

Add option to omit metadata [ESD-1170] #663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions python/sbp/client/framer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,19 @@ class Framer(six.Iterator):
Stream of bytes to write to.
"""

def __init__(self, read, write, verbose=False, dispatcher=dispatch):
def __init__(self,
read,
write,
verbose=False,
dispatcher=dispatch,
skip_metadata=False):
self._read = read
self._write = write
self._verbose = verbose
self._broken = False
self._dispatch = dispatcher
self._session = str(uuid.uuid4())
self._skip_metadata = skip_metadata

def __iter__(self):
self._broken = False
Expand Down Expand Up @@ -71,7 +77,13 @@ def __next__(self):
raise StopIteration
except IOError:
raise StopIteration
return (msg, {'time': self._time(), 'session-uid': self._session})

metadata = {}
if not self._skip_metadata:
metadata['time'] = self._time()
metadata['session-uid'] = self._session

return (msg, metadata)

def _readall(self, size):
"""
Expand Down
18 changes: 12 additions & 6 deletions python/sbp/client/loggers/json_logger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,12 @@ class JSONLogger(BaseLogger):
"""

def fmt_msg(self, data, **metadata):
metadata.update(self.tags)
metadata['data'] = data
return metadata
if metadata:
metadata.update(self.tags)
metadata['data'] = data
return metadata

return data

def dump(self, msg, **metadata):
try:
Expand Down Expand Up @@ -55,9 +58,12 @@ class JSONBinLogger(BaseLogger):
"""

def fmt_msg(self, data, **metadata):
metadata.update(self.tags)
metadata['data'] = data
return metadata
if metadata:
metadata.update(self.tags)
metadata['data'] = data
return metadata

return data

def dump(self, msg, **metadata):
try:
Expand Down