ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-31 16:36:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move inotify events eliot field

Browse Source
This commit is contained in:
Jean-Paul Calderone 2019-02-27 13:05:21 -05:00
parent 1883cee37f
commit 3b5e8d7e6b
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,9 +35,6 @@ from allmydata.util import (
yamlutil, yamlutil,
eliotutil, eliotutil,
) )
from allmydata.util.fake_inotify import (
humanReadableMask,
)
from allmydata.interfaces import IDirectoryNode from allmydata.interfaces import IDirectoryNode
from allmydata.util import log from allmydata.util import log
from allmydata.util.fileutil import ( from allmydata.util.fileutil import (
@ -690,13 +687,6 @@ NOTIFIED = ActionType(
u"Magic-Folder received a notification of a local filesystem change for a certain path.", u"Magic-Folder received a notification of a local filesystem change for a certain path.",
) )
_EVENTS = Field(
u"events",
humanReadableMask,
u"Details about a filesystem event generating a notification event.",
eliotutil.validateInstanceOf((int, long)),
)
_NON_DIR_CREATED = Field.for_types( _NON_DIR_CREATED = Field.for_types(
u"non_dir_created", u"non_dir_created",
[bool], [bool],
@ -706,7 +696,7 @@ _NON_DIR_CREATED = Field.for_types(
REACT_TO_INOTIFY = ActionType( REACT_TO_INOTIFY = ActionType(
u"magic-folder:react-to-inotify", u"magic-folder:react-to-inotify",
[_EVENTS], [eliotutil.INOTIFY_EVENTS],
[_IGNORED, _NON_DIR_CREATED, _ALREADY_PENDING], [_IGNORED, _NON_DIR_CREATED, _ALREADY_PENDING],
u"Magic-Folder is processing a notification from inotify(7) (or a clone) about a filesystem event.", u"Magic-Folder is processing a notification from inotify(7) (or a clone) about a filesystem event.",
) )
@ -1260,7 +1250,7 @@ class Uploader(QueueMixin):
# All can do is id() or repr() it and neither of those actually # All can do is id() or repr() it and neither of those actually
# produces very illuminating results. We drop opaque on the # produces very illuminating results. We drop opaque on the
# floor, anyway. # floor, anyway.
events=events_mask, inotify_events=events_mask,
) )
success_fields = dict(non_dir_created=False, already_pending=False, ignored=False) success_fields = dict(non_dir_created=False, already_pending=False, ignored=False)