crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[sip/sms] File d'attente des sms dans la base pgsql

Browse source
This commit is contained in:
Valentin Samir 2013-11-11 19:26:48 +01:00
parent 386086a93c
commit 78385c4535
3 changed files with 27 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sip/agi/sms_delay
View file

@ -6,7 +6,7 @@ from asterisk import Sms
if __name__ == '__main__' : if __name__ == '__main__' :
if len(sys.argv)>4: if len(sys.argv)>4:
sms=Sms('/var/spool/asterisk/sms/') sms=Sms("dbname='django' user='crans' host='pgsql.adm.crans.org'", "voip_sms")
sms.sms_delay(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], body_type='base64') sms.sms_delay(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], body_type='base64')
else: else:
print >> sys.stderr, "Usage %s {from} {to} {body_base64} {user}" % sys.argv[0] print >> sys.stderr, "Usage %s {from} {to} {body_base64} {user}" % sys.argv[0]

54
sip/asterisk.py
View file

@ -11,6 +11,7 @@ import syslog
import socket import socket
import base64 import base64
import psycopg2 import psycopg2
import psycopg2.extras
from datetime import datetime from datetime import datetime
sys.path.append('/usr/scripts/') sys.path.append('/usr/scripts/')
@ -66,8 +67,9 @@ class Profile(object):
return num return num
class Sms(object): class Sms(object):
def __init__(self,sms_dir): def __init__(self, sql_params=None, database=None):
self.sms_dir=sms_dir self.sql_params = sql_params
self.database = database
def sms_daemon(self, server,port,user,password, timeout=360): def sms_daemon(self, server,port,user,password, timeout=360):
manager = Manager(user, password, server=server, event=True, auto_connect=False, timeout=timeout) manager = Manager(user, password, server=server, event=True, auto_connect=False, timeout=timeout)
@ -77,7 +79,7 @@ class Sms(object):
try: try:
while True: while True:
manager.process_events() manager.process_events()
except (socket.error, asterisk.NullRecv): except (socket.error, NullRecv):
pass pass
def _mkdirs(self, path): def _mkdirs(self, path):
@ -91,43 +93,31 @@ class Sms(object):
def sms_delay(self, src, dst, body, user, body_type='str'): def sms_delay(self, src, dst, body, user, body_type='str'):
if not body_type in ["str", "base64"]: if not body_type in ["str", "base64"]:
raise EnvironmentError("body_type sould be 'str' ou 'base64' not %r" % body_type) raise EnvironmentError("body_type sould be 'str' ou 'base64' not %r" % body_type)
date = datetime.now().strftime('%Y%m%d%H%M%S.%f') conn = psycopg2.connect(self.sql_params)
path = self.sms_dir + user + '/' + date + '/' cur = conn.cursor()
self._mkdirs(path) cur.execute('INSERT INTO %s (date, "from", "to", body, "user") VALUES (NOW(), %%s, %%s, %%s, %%s)' % self.database, (src, dst, base64.encodestring(body).strip() if body_type=='str' else body, user))
with open(path + 'from', 'w') as f: conn.commit()
f.write(src) cur.close()
with open(path + 'to', 'w') as f: conn.close()
f.write(dst)
with open(path + 'body', 'w') as f:
if body_type=='str':
f.write(base64.encodestring(body).strip())
elif body_type=='base64':
f.write(body)
def _send_sms(self, manager, params): def _send_sms(self, manager, params):
if params['PeerStatus'] in ['Reachable','Registered']: if params['PeerStatus'] in ['Reachable','Registered']:
num = params['Peer'].split('/')[1] num = params['Peer'].split('/')[1]
if os.path.isdir(self.sms_dir + '/' + num + '/'): conn = psycopg2.connect(self.sql_params)
dir=os.listdir(self.sms_dir + '/' + num + '/') cur = conn.cursor(cursor_factory=psycopg2.extras.DictCursor)
dir.sort() cur.execute('SELECT * FROM %s WHERE "user"=%%s' % self.database, (num,))
for sms in dir: for sms in cur.fetchall():
sms_path=self.sms_dir + '/' + num + '/' + sms + '/' status, params = manager.messageSend(sms['from'], sms['to'], sms['body'], body_type='base64')
if os.path.isfile(sms_path + 'from') and os.path.isfile(sms_path + 'to') and os.path.isfile(sms_path + 'body'):
sms_from=open(sms_path + 'from').read()
sms_to=open(sms_path + 'to').read()
sms_body=open(sms_path + 'body').read()
status, params = manager.messageSend(sms_from, sms_to, sms_body, body_type='base64')
if status == 'Success': if status == 'Success':
syslog.syslog("Message from %s successfully delivered to %s" % (sms_from, sms_to)) syslog.syslog("Message from %s successfully delivered to %s" % (sms['from'], sms['to']))
shutil.rmtree(sms_path) cur.execute('DELETE FROM %s WHERE id=%%s' % self.database, (sms['id'],))
try: conn.commit()
os.rmdir(self.sms_dir + '/' + num + '/')
except OSError:
pass
elif status == 'Error': elif status == 'Error':
syslog.syslog("Message from %s to %s : %s" % (sms_from, sms_to, params['Message'])) syslog.syslog("Message from %s to %s : %s" % (sms['from'], sms['to'], params['Message']))
cur.close()
conn.close()
class History(object): class History(object):
def __init__(self, sql_params, database, quota_limit): def __init__(self, sql_params, database, quota_limit):

3
sip/sms_queuing
View file

@ -6,6 +6,5 @@ sys.path.insert(0, '/usr/scripts/gestion/secrets')
from secrets import asterisk_sms_passwd from secrets import asterisk_sms_passwd
if __name__ == '__main__' : if __name__ == '__main__' :
# TODO ranger ceci dans /usr/scripts/var sms=Sms("dbname='django' user='crans' host='pgsql.adm.crans.org'", "voip_sms")
sms=Sms('/var/spool/asterisk/sms/')
sms.sms_daemon('localhost', 5038, 'sms', asterisk_sms_passwd) sms.sms_daemon('localhost', 5038, 'sms', asterisk_sms_passwd)