Skip to content

Commit

Permalink
Merge pull request #238 from jookies/v0.6-beta
Browse files Browse the repository at this point in the history
v0.6b33
  • Loading branch information
farirat committed Jul 4, 2015
2 parents de507a2 + 63d753d commit e5fd8fb
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
7 changes: 5 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
language: python
python:
- "2.7"
- '2.7'
# Command to install dependencies
install:
- python setup.py sdist
- sudo pip install dist/jasmin-0.6b32.tar.gz
- sudo pip install dist/jasmin-0.6b33.tar.gz
- sudo cp misc/config/init-script/jasmind-ubuntu /etc/init.d/jasmind
- sudo update-rc.d jasmind defaults
# Commands to run tests:
Expand Down Expand Up @@ -44,3 +44,6 @@ before_install:
- sudo mkdir -p /var/log/jasmin /etc/jasmin/resource /etc/jasmin/init-script /etc/jasmin/store /var/run/jasmin
- sudo chown `whoami` /etc/jasmin /etc/jasmin/resource /etc/jasmin/init-script
- sudo chown jasmin. /var/log/jasmin /etc/jasmin/store /var/run/jasmin
notifications:
slack:
secure: guCY7vL67vUhvNYLzInV/EIPMZ7ciq+/s0UlfmKvGYrjIMwXdgfshgKXdHF194eQ9+f0dF8ea1P1/aGqCE4Q4ULPZ555FbftNy/bVLfUPn01+odorAux3rVNq4ezX2QlQc06DpVS2r7U+grM+MQtNdRjoZIuAeipp3YRhyyuIr8=
2 changes: 1 addition & 1 deletion jasmin/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

MAJOR = 0
MINOR = 6
PATCH = 32
PATCH = 33
META = 'b'

def get_version():
Expand Down
4 changes: 2 additions & 2 deletions jasmin/managers/listeners.py
Original file line number Diff line number Diff line change
Expand Up @@ -747,8 +747,8 @@ def deliver_sm_event(self, smpp, pdu, concatenated = False):
else:
self.log.debug('SMS-C receipt is requested, will not send any DLR receipt at this level.')
else:
self.log.warn('Got invalid DLR information for msgid[%s], url:%s, level:%s' %
(submit_sm_queue_id, dlr_url, dlr_level))
self.log.warn('DLR for msgid[%s] not found !' %
(submit_sm_queue_id))
elif submit_sm_queue_id is not None and connector_type == 'smpps':
pickledSmppsMap = yield self.redisClient.get("smppsmap:%s" % submit_sm_queue_id)

Expand Down

0 comments on commit e5fd8fb

Please sign in to comment.