morp 5.2.0__tar.gz → 5.2.2__tar.gz

{morp-5.2.0 → morp-5.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: morp
-Version: 5.2.0
+Version: 5.2.2
 Summary: Send and receive messages without thinking about it
 Home-page: http://github.com/Jaymon/morp
 Author: Jay Marcyes

{morp-5.2.0 → morp-5.2.2}/morp/__init__.py

@@ -19,5 +19,5 @@ from .exception import (
 )
 
 
-__version__ = '5.2.0'
+__version__ = '5.2.2'
 

{morp-5.2.0 → morp-5.2.2}/morp/interface/base.py

@@ -84,7 +84,6 @@ class Interface(InterfaceABC):
 
         this will set the raw db connection to self.connection
         """
-
         if self.connected: return self.connected
         if connection_config: self.connection_config = connection_config
 

{morp-5.2.0 → morp-5.2.2}/morp/interface/dropfile.py

@@ -138,11 +138,17 @@ class Dropfile(Interface):
         # one thing we can do with an exclusive lock to tell other processes
         # we have already looked at the file, I wish we could delete under an 
         # exclusive lock)
-        if kwargs.get("truncate", True):
-            fp.truncate()
+        try:
+            if kwargs.get("truncate", True):
+                fp.truncate()
 
-        fcntl.flock(fp, fcntl.LOCK_UN)
-        fp.close()
+            fcntl.flock(fp, fcntl.LOCK_UN)
+            fp.close()
+
+        except ValueError:
+            # .truncate - ValueError: truncate of closed file
+            # .flock - ValueError: I/O operation on closed file
+            pass
 
         if kwargs.get("delete", True):
             message.delete()

{morp-5.2.0 → morp-5.2.2}/morp/interface/sqs.py

@@ -9,6 +9,7 @@ import boto3
 from botocore.exceptions import ClientError
 from botocore.credentials import RefreshableCredentials
 from botocore.session import get_session
+from datatypes import Datetime
 
 from ..compat import *
 from .base import Interface
@@ -82,6 +83,8 @@ class RefreshableSession(boto3.Session):
             profile_name=self.connection_config.options.get("profile_name", None),
         )
 
+        session_ttl = self.connection_config.options.get("session_ttl", 3600)
+
         # if an sts arn is given, get credential by assuming given role
         if arn := self.connection_config.options.get("arn", ""):
             sts_client = session.client(
@@ -95,10 +98,7 @@ class RefreshableSession(boto3.Session):
                     "session_name",
                     "morp"
                 ),
-                DurationSeconds=self.connection_config.options.get(
-                    "session_ttl",
-                    3600
-                ),
+                DurationSeconds=session_ttl,
             ).get("Credentials")
 
             credentials = {
@@ -114,7 +114,7 @@ class RefreshableSession(boto3.Session):
                 "access_key": session_credentials.get("access_key"),
                 "secret_key": session_credentials.get("secret_key"),
                 "token": session_credentials.get("token"),
-                "expiry_time": Datetime(seconds=self.session_ttl).isoformat(),
+                "expiry_time": Datetime(seconds=session_ttl).isoformat(),
             }
 
         return credentials

{morp-5.2.0 → morp-5.2.2}/morp/message.py

@@ -294,13 +294,13 @@ class Message(object):
 
     def ack(self):
         """Acknowledge this message has been processed"""
-        cls.interface.ack(cls.get_name(), self.to_interface())
+        self.interface.ack(self.get_name(), self.to_interface())
 
     def release(self, **kwargs):
         """Release this message back to the interface so another message instance
         can pick it up
         """
-        cls.interface.release(cls.get_name(), self.to_interface(), **kwargs)
+        self.interface.release(self.get_name(), self.to_interface(), **kwargs)
 
     def release_later(self, delay_seconds):
         """If you want to release the message and not have it be visible for some

{morp-5.2.0 → morp-5.2.2}/morp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: morp
-Version: 5.2.0
+Version: 5.2.2
 Summary: Send and receive messages without thinking about it
 Home-page: http://github.com/Jaymon/morp
 Author: Jay Marcyes