Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 18:44:51 -04:00
Code Issues Projects Releases Packages Wiki Activity

Move test stuff to tests

Browse source
This commit is contained in:
Erik Johnston 2018-01-18 11:53:21 +00:00
parent 2f18a2647b
commit 1432f7ccd5
2 changed files with 47 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

26
synapse/util/file_consumer.py
View file

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from twisted.internet import defer, threads, reactor
from twisted.internet import threads, reactor
from synapse.util.logcontext import make_deferred_yieldable
@ -57,10 +57,6 @@ class BackgroundFileConsumer(object):
# If the _writer thread throws an exception it gets stored here.
self._write_exception = None
# A deferred that gets resolved when the bytes_queue gets empty.
# Mainly used for tests.
self._notify_empty_deferred = None
def registerProducer(self, producer, streaming):
"""Part of IConsumer interface
@ -113,9 +109,6 @@ class BackgroundFileConsumer(object):
if self._bytes_queue.qsize() <= self._RESUME_ON_QUEUE_SIZE:
reactor.callFromThread(self._resume_paused_producer)
if self._notify_empty_deferred and self._bytes_queue.empty():
reactor.callFromThread(self._notify_empty)
bytes = self._bytes_queue.get()
# If we get a None (or empty list) then that's a signal used
@ -144,20 +137,3 @@ class BackgroundFileConsumer(object):
if self._paused_producer and self._producer:
self._paused_producer = False
self._producer.resumeProducing()
def _notify_empty(self):
"""Called when the _writer thread thinks the queue may be empty and
we should notify anything waiting on `wait_for_writes`
"""
if self._notify_empty_deferred and self._bytes_queue.empty():
d = self._notify_empty_deferred
self._notify_empty_deferred = None
d.callback(None)
def wait_for_writes(self):
"""Wait for the write queue to be empty and for writes to have
finished. This is mainly useful for tests.
"""
if not self._notify_empty_deferred:
self._notify_empty_deferred = defer.Deferred()
return self._notify_empty_deferred