Merge branch 'master' into v0.9

jookies · Nov 10, 2016 · eb739aa · eb739aa
2 parents d481559 + aed63dd
commit eb739aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/misc/doc/sources/management/jcli/modules.rst b/misc/doc/sources/management/jcli/modules.rst
@@ -912,7 +912,7 @@ The SMPP Client connector manager module is accessible through the **smppccm** c
    * - -1 CID, --start=CID
      - Start SMPP connector using it's CID
    * - -0 CID, --stop=CID
-     - Start SMPP connector using it's CID
+     - Stop SMPP connector using it's CID
 
 A SMPP Client connector is used to send/receive SMS through SMPP v3.4 protocol, it is directly connected to MO and MT routers to
 provide end-to-end message delivery.

diff --git a/misc/scripts/sms_logger.py b/misc/scripts/sms_logger.py
@@ -84,7 +84,11 @@ def gotConnection(conn, username, password):
             pdu = pickle.loads(msg.content.body)
             pdu_count = 1
             short_message = pdu.params['short_message']
-            submit_sm_bill = pickle.loads(props['headers']['submit_sm_resp_bill'])
+            billing = props['headers']
+            billing_pickle = billing.get('submit_sm_resp_bill')
+            if not billing_pickle:
+                billing_pickle = billing.get('submit_sm_bill')
+            submit_sm_bill = pickle.loads(billing_pickle)
             source_connector = props['headers']['source_connector']
             routed_cid = msg.routing_key[10:]