Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

repeated _save_msg_to_queue procedure until message can be saved. issue 64 #249

Open
wants to merge 12 commits into
base: dev
Choose a base branch
from
Open

repeated _save_msg_to_queue procedure until message can be saved. issue 64 #249

Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5211ecc
procedure repeated issue 64
DanielPerkins7 Aug 1, 2023
5897f7e
repeats procedure to try fix error. issue 64
DanielPerkins7 Aug 2, 2023
52554c6
Merge branch 'apel:dev' into issue64
DanielPerkins7 Aug 2, 2023
c78cca2
procedure repeated until it works, issue 64
DanielPerkins7 Aug 2, 2023
643e912
Merge branch 'issue64' of github.com:DanielPerkins7/ssm into issue64
DanielPerkins7 Aug 2, 2023
4067424
procedure repeated
DanielPerkins7 Aug 2, 2023
4b3dce3
procedure repeated
DanielPerkins7 Aug 2, 2023
a70754c
Merge branch 'issue64' of github.com:DanielPerkins7/ssm into issue64
DanielPerkins7 Aug 2, 2023
7849c57
loops add calls, issue 64
DanielPerkins7 Aug 2, 2023
919a0f2
Please enter the commit message for your changes. Lines starting
DanielPerkins7 Aug 3, 2023
0ea9f5f
repeats name variable initialisation if failed. issue 64
DanielPerkins7 Aug 3, 2023
dd25479
removes trailing whitespace
DanielPerkins7 Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion ssm/ssm2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,11 @@ def _handle_msg(self, text):

return message, signer, None

fails = 0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Declaring fails here puts it outside the scope of the method, which has lead to the Travis CI failing the unit tests.

def _save_msg_to_queue(self, body, empaid):
"""Extract message contents and add to the accept or reject queue."""
extracted_msg, signer, err_msg = self._handle_msg(body)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Careful with adding extra whitespace.

try:
# If the message is empty or the error message is not empty
# then reject the message.
Expand All @@ -343,10 +345,14 @@ def _save_msg_to_queue(self, body, empaid):
name = self._inq.add({'body': extracted_msg,
'signer': signer,
'empaid': empaid})
log.info("Message saved to incoming queue as %s", name)

log.info("Message saved to incoming queue as %s", name)
DanielPerkins7 marked this conversation as resolved.
Show resolved Hide resolved

except (IOError, OSError) as error:
log.error('Failed to read or write file: %s', error)
fails += 1
if fails <= 3:
return _save_msg_to_queue(self, body, empaid)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure that using recursion here is the right answer. A simple loop for the add calls would be the more straightforward solution.


def _send_msg(self, message, msgid):
"""Send one message using stomppy.
Expand Down