Merge pull request #221 from ghjm/framed_message_fix

Fix file buffers so work.py interface can function as intended

Reviewed-by: https://github.com/apps/ansible-zuul

Author: ansible-zuul[bot]

receptor/messages/framed.py

@@ -109,9 +109,8 @@ def __init__(self, fp, length=0, min_chunk=2 ** 12, max_chunk=2 ** 20):
         self._max_chunk = max_chunk
 
     @classmethod
-    def from_temp(cls, dir=None, delete=False):
-        # return cls(tempfile.NamedTemporaryFile(dir=dir, delete=delete))
-        return cls(tempfile.SpooledTemporaryFile(dir=dir, max_size=2 ** 12))
+    def from_temp(cls, dir=None, delete=True):
+        return cls(tempfile.NamedTemporaryFile(dir=dir, delete=delete))
 
     @classmethod
     def from_buffer(cls, buffered_io, dir=None, delete=False):
@@ -120,15 +119,15 @@ def from_buffer(cls, buffered_io, dir=None, delete=False):
         return cls(fp=buffered_io, length=buffered_io.getbuffer().nbytes)
 
     @classmethod
-    def from_data(cls, raw_data, dir=None, delete=False):
+    def from_data(cls, raw_data, dir=None, delete=True):
         if isinstance(raw_data, str):
             raw_data = raw_data.encode()
         fbb = cls.from_temp(dir=dir, delete=delete)
         fbb.write(raw_data)
         return fbb
 
     @classmethod
-    def from_dict(cls, raw_data, dir=None, delete=False):
+    def from_dict(cls, raw_data, dir=None, delete=True):
         try:
             d = json.dumps(raw_data).encode("utf-8")
         except Exception as e:
@@ -173,6 +172,9 @@ def readall(self):
         finally:
             self.fp.seek(pos)
 
+    def flush(self):
+        self.fp.flush()
+
     def __len__(self):
         return self.length
 

receptor/work.py

@@ -71,6 +71,7 @@ def resolve_payload_input(self, payload_type, payload):
             payload.seek(0)
             return payload
         elif payload_type == FILE_PAYLOAD:
+            payload.flush()
             return payload.name
         return payload.readall()