ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-19 13:07:56 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #560 from tahoe-lafs/2982.process-queue-logging-fix

Browse Source 
Fix serialization errors in the Eliot logging for the queue state.

Fixes: ticket:2982
This commit is contained in:
Jean-Paul Calderone 2019-03-04 12:37:24 -05:00 committed by GitHub
commit 2931721dfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
newsfragments/2982.other Normal file
View File

10
src/allmydata/frontends/magic_folder.py
View File

@ -536,7 +536,7 @@ REMOVE_FROM_PENDING = ActionType(
PATH = Field(
u"path",
lambda fp: quote_filepath(fp),
lambda fp: fp.asTextMode().path,
u"A local filesystem path.",
eliotutil.validateInstanceOf(FilePath),
)
@ -773,7 +773,7 @@ ALL_FILES = MessageType(
_ITEMS = Field(
u"items",
lambda deque: list(deque),
lambda deque: list(dict(relpath=item.relpath_u, kind=item.kind) for item in deque),
u"Items in a processing queue.",
)
@ -1055,6 +1055,8 @@ class IQueuedItem(Interface):
@implementer(IQueuedItem)
class QueuedItem(object):
kind = None
def __init__(self, relpath_u, progress, size):
self.relpath_u = relpath_u
self.progress = progress
@ -1096,7 +1098,7 @@ class UploadItem(QueuedItem):
"""
Represents a single item the _deque of the Uploader
"""
pass
kind = u"upload"
_ITEM = Field(
@ -1611,6 +1613,8 @@ class DownloadItem(QueuedItem):
"""
Represents a single item in the _deque of the Downloader
"""
kind = u"download"
def __init__(self, relpath_u, progress, filenode, metadata, size):
super(DownloadItem, self).__init__(relpath_u, progress, size)
self.file_node = filenode