Compare commits
2 Commits
083bf20be7
...
7c1d645447
| Author | SHA1 | Date | |
|---|---|---|---|
|
7c1d645447
|
|||
|
dadf3d72e3
|
@@ -1,22 +1,22 @@
|
|||||||
asn1crypto==1.5.1
|
asn1crypto==1.5.1
|
||||||
certifi==2025.4.26
|
certifi==2026.5.20
|
||||||
cffi==1.17.1
|
cffi==2.0.0
|
||||||
charset-normalizer==3.4.2
|
charset-normalizer==3.4.7
|
||||||
click==8.2.1
|
click==8.4.0
|
||||||
cryptography==45.0.3
|
cryptography==48.0.0
|
||||||
idna==3.10
|
idna==3.15
|
||||||
lxml==5.4.0
|
lxml==6.1.1
|
||||||
oscrypto==1.3.0
|
oscrypto==1.3.0
|
||||||
pika==1.3.2
|
pika==1.4.0
|
||||||
pika-stubs==0.1.3
|
pika-stubs==0.1.3
|
||||||
pycparser==2.22
|
pycparser==3.0
|
||||||
pyHanko==0.29.0
|
pyHanko==0.35.1
|
||||||
pyhanko-certvalidator==0.27.0
|
pyhanko-certvalidator==0.31.1
|
||||||
pypng==0.20220715.0
|
pypng==0.20220715.0
|
||||||
PyYAML==6.0.2
|
PyYAML==6.0.3
|
||||||
qrcode==8.2
|
qrcode==8.2
|
||||||
requests==2.32.3
|
requests==2.34.2
|
||||||
typing_extensions==4.14.0
|
typing_extensions==4.15.0
|
||||||
tzlocal==5.3.1
|
tzlocal==5.3.1
|
||||||
uritools==5.0.0
|
uritools==6.1.1
|
||||||
urllib3==2.4.0
|
urllib3==2.7.0
|
||||||
|
|||||||
+15
-8
@@ -5,6 +5,7 @@ import os
|
|||||||
|
|
||||||
import pika
|
import pika
|
||||||
import sign
|
import sign
|
||||||
|
from pyhanko.sign.general import SigningError
|
||||||
|
|
||||||
LOG_FORMAT = ('%(levelname) -10s %(asctime)s %(name) -30s %(funcName) '
|
LOG_FORMAT = ('%(levelname) -10s %(asctime)s %(name) -30s %(funcName) '
|
||||||
'-35s %(lineno) -5d: %(message)s')
|
'-35s %(lineno) -5d: %(message)s')
|
||||||
@@ -67,16 +68,22 @@ def on_message(channel, method_frame, header_frame, body):
|
|||||||
LOGGER.debug("signed file resend to amqp")
|
LOGGER.debug("signed file resend to amqp")
|
||||||
channel.basic_ack(delivery_tag=method_frame.delivery_tag)
|
channel.basic_ack(delivery_tag=method_frame.delivery_tag)
|
||||||
|
|
||||||
except Exception as e:
|
except SigningError as e:
|
||||||
LOGGER.warning(f"error encountered while signing: {e}")
|
LOGGER.error(f"signing error for signatureId {body_content['signatureId']}: {e}", exc_info=True)
|
||||||
if method_frame.redelivered:
|
if method_frame.redelivered:
|
||||||
LOGGER.warning(
|
LOGGER.error(f"message already redelivered, discarding signatureId: {body_content['signatureId']}")
|
||||||
f"stopping handling this message, because the message is already redelivered, signatureId: {body_content['signatureId']}")
|
channel.basic_reject(delivery_tag=method_frame.delivery_tag, requeue=False)
|
||||||
channel.basic_reject(delivery_tag=method_frame.delivery_tag, requeue=True)
|
|
||||||
else:
|
else:
|
||||||
LOGGER.warning(f"first try failed, signatureId: {body_content['signatureId']}")
|
LOGGER.warning(f"first try failed, requeueing for one retry, signatureId: {body_content['signatureId']}")
|
||||||
channel.basic_ack(delivery_tag=method_frame.delivery_tag)
|
channel.basic_nack(delivery_tag=method_frame.delivery_tag, requeue=True)
|
||||||
raise e
|
except Exception as e:
|
||||||
|
LOGGER.warning(f"error encountered while signing, signatureId: {body_content['signatureId']}: {e}", exc_info=True)
|
||||||
|
if method_frame.redelivered:
|
||||||
|
LOGGER.warning(f"message already redelivered, discarding signatureId: {body_content['signatureId']}")
|
||||||
|
channel.basic_reject(delivery_tag=method_frame.delivery_tag, requeue=False)
|
||||||
|
else:
|
||||||
|
LOGGER.warning(f"first try failed, requeueing for one retry, signatureId: {body_content['signatureId']}")
|
||||||
|
channel.basic_nack(delivery_tag=method_frame.delivery_tag, requeue=True)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|||||||
Reference in New Issue
Block a user