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.

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

0.10 #1144

Merged
merged 31 commits into from
Nov 10, 2023
Merged

0.10 #1144

Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
6293d8a
Correct options descriptions: add missing start word
mexicarne Oct 4, 2022
6757a91
docker restapi set to slim
BlackOrder Dec 19, 2022
d6f5fc2
python with jemalloc
BlackOrder Dec 19, 2022
3e7e370
cleanup
BlackOrder Dec 19, 2022
39ee472
dynamic sub-services host/port
BlackOrder Dec 19, 2022
9981e45
if path is url, use urllib.request to get
BlackOrder Jan 1, 2023
1fd3529
InvalidScriptSyntax message inclue url example
BlackOrder Jan 1, 2023
987be21
handle only http/s, ftp, and file
BlackOrder Jan 2, 2023
b620681
add note to docs about remote path
BlackOrder Jan 2, 2023
8372cc5
reversed error message
BlackOrder Jan 2, 2023
8c26145
Merge pull request #1101 from BlackOrder/docker-dynamic-subservices
farirat Jan 10, 2023
9321573
Merge branch '0.10' into docker-restapi-jemalloc
farirat Jan 10, 2023
798ac30
Merge pull request #1100 from BlackOrder/docker-restapi-jemalloc
farirat Jan 11, 2023
03b6a4c
detect path type with urlparse
BlackOrder Jan 12, 2023
3b7433b
cast logprivacy to boolean
BlackOrder Dec 26, 2022
dc0c5c7
Quickfix for setting default values for multipart messages.
Kisuke-CZE Oct 20, 2023
ff9424a
Adjust logging. Log message DLR, SRC_ADDR and DST_ADDR according to l…
Kisuke-CZE Oct 24, 2023
58f8993
Adjust logging. Log message DLR, SRC_ADDR and DST_ADDR according to l…
Kisuke-CZE Oct 24, 2023
7fff3f2
Revert "Adjust logging. Log message DLR, SRC_ADDR and DST_ADDR accord…
Kisuke-CZE Oct 24, 2023
e81a3c1
reuse _pdu for clarity
farirat Nov 7, 2023
08f965f
version bump
farirat Nov 7, 2023
3be523c
Merge pull request #1141 from Kisuke-CZE/fix-multipart-logging
farirat Nov 7, 2023
ea08012
Merge pull request #1105 from BlackOrder/logprivacy
farirat Nov 7, 2023
c9e2eeb
Merge pull request #1140 from Kisuke-CZE/master
farirat Nov 7, 2023
7028913
Merge pull request #1077 from mexicarne/correct-descriptions
farirat Nov 7, 2023
d331036
Merge branch '0.10' into cli_interceptors_accepts_url
farirat Nov 7, 2023
b4f516e
avoiding imports from inside code for better readability and to allow…
farirat Nov 7, 2023
8a41ef3
avoiding imports from inside code for better readability and to allow…
farirat Nov 7, 2023
f74cc31
Merge pull request #1102 from BlackOrder/cli_interceptors_accepts_url
farirat Nov 7, 2023
ef4ccdd
Merge branch '0.10' into 0.10.14
farirat Nov 7, 2023
b48de91
Merge pull request #1143 from jookies/0.10.14
farirat Nov 9, 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
Prev Previous commit
Next Next commit
Adjust logging. Log message DLR, SRC_ADDR and DST_ADDR according to l…
…ast part of the message.
  • Loading branch information
Kisuke-CZE committed Oct 24, 2023
commit ff9424adde73d17797f63505d7d932714e1eb252
10 changes: 6 additions & 4 deletions jasmin/managers/listeners.py
Original file line number Diff line number Diff line change
@@ -291,10 +291,12 @@ def submit_sm_resp_event(self, r, amqpMessage):
splitMethod = 'sar'
elif UDHI_INDICATOR_SET and r.request.params['short_message'][:3] == b'\x05\x00\x03':
splitMethod = 'udh'

# create _pdu before splitting, so we can use it in both branches (logging the message according the last part of message)
_pdu = r.request

# Concatenate short_message
if splitMethod is not None:
_pdu = r.request
if splitMethod == 'sar':
short_message = _pdu.params['short_message']
else:
@@ -328,12 +330,12 @@ def submit_sm_resp_event(self, r, amqpMessage):
r.response.params['message_id'],
r.response.status,
amqpMessage.content.properties['priority'],
r.request.params['registered_delivery'].receipt,
_pdu.params['registered_delivery'].receipt,
'none' if ('headers' not in amqpMessage.content.properties or
'expiration' not in amqpMessage.content.properties['headers'])
else amqpMessage.content.properties['headers']['expiration'],
r.request.params['source_addr'],
r.request.params['destination_addr'],
_pdu.params['source_addr'],
_pdu.params['destination_addr'],
logged_content)
else:
# Message must be retried ?