From 9b0f83fd331f123f5fe7b194360898fe0a95b8f7 Mon Sep 17 00:00:00 2001 From: Valentin Samir Date: Wed, 20 Nov 2013 00:49:33 +0100 Subject: [PATCH] =?UTF-8?q?[sip/asterisk/sms=5Fdaemon]=20Erreur=20via=20le?= =?UTF-8?q?v=C3=A9e=20d'exceptions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sip/asterisk.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sip/asterisk.py b/sip/asterisk.py index 787fef3c..3f27e461 100644 --- a/sip/asterisk.py +++ b/sip/asterisk.py @@ -111,14 +111,14 @@ class Sms(object): num = params['Peer'].split('/')[1] conn = psycopg2.connect(self.sql_params) cur = conn.cursor(cursor_factory=psycopg2.extras.DictCursor) - cur.execute('SELECT * FROM %s WHERE "user"=%%s' % self.database, (num,)) + cur.execute('SELECT * FROM %s WHERE "user"=%%s ORDER BY "date" ASC' % self.database, (num,)) for sms in cur.fetchall(): - status, params = manager.messageSend(sms['from'], sms['to'], sms['body'], body_type='base64') - if status == 'Success': + try: + manager.messageSend(sms['from'], sms['to'], sms['body'], body_type='base64') syslog.syslog("Message from %s successfully delivered to %s" % (sms['from'], sms['to'])) cur.execute('DELETE FROM %s WHERE id=%%s' % self.database, (sms['id'],)) conn.commit() - elif status == 'Error': + except AsteriskError as error: syslog.syslog("Message from %s to %s : %s" % (sms['from'], sms['to'], params['Message'])) cur.close() conn.close()