diff options
| author | Tim Redfern <tim@eclectronics.org> | 2012-06-30 18:45:03 +0100 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2012-06-30 18:45:03 +0100 |
| commit | 9642f41ffa762213dc947407ac2ca484b14fd5c7 (patch) | |
| tree | 7156f3b2ef85f4b6fe1f743817dd3cf1080af01b /eventStreamer | |
| parent | 4525c22d902e1eff47d6a8a64d022d885ac3a76a (diff) | |
segfaults intermittently
Diffstat (limited to 'eventStreamer')
| -rwxr-xr-x | eventStreamer/eventStreamer.py | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/eventStreamer/eventStreamer.py b/eventStreamer/eventStreamer.py index 35c7033..7e97821 100755 --- a/eventStreamer/eventStreamer.py +++ b/eventStreamer/eventStreamer.py @@ -25,11 +25,24 @@ outsock = socket.socket( socket.AF_INET,socket.SOCK_DGRAM ) devices={} def sendevent(e): + if not devices[e[3]].has_key('IMSI'): + devices[e[3]]['IMSI']="123456789012345" + elif devices[e[3]]['IMSI']==None: + devices[e[3]]['IMSI']="123456789012345" + if not devices[e[3]].has_key('IMEI'): + devices[e[3]]['IMEI']="1234567890" + elif devices[e[3]]['IMEI']==None: + devices[e[3]]['IMEI']="1234567890" + if not devices[e[3]].has_key('number'): + devices[e[3]]['number']="1234" + elif devices[e[3]]['number']==None: + devices[e[3]]['number']="1234" #send all data in each event to avoid translation script having a state print str(e[3]),devices[e[3]]['IMSI'],devices[e[3]]['IMEI'],devices[e[3]]['number'],str(e[1]) outsock.sendto( devices[e[3]]['IMSI']+"^"+devices[e[3]]['IMEI']+"^"+devices[e[3]]['number']+"^"+str(e[1]), (config.viz_ip, config.viz_port) ) def senddevice(d): + print d['IMSI'],d['IMEI'],d['number'],",retreived" outsock.sendto( d['IMSI']+"^"+d['IMEI']+"^"+d['number']+"^"+"retreived", (config.viz_ip, config.viz_port) ) def main(): @@ -62,12 +75,18 @@ def main(): cursor.execute(sql) results = cursor.fetchall() for row in results: - d={} - d['IMSI']=row[1] - d['IMEI']=row[2] - d['number']=row[3] - devices[row[0]]=d - senddevice(d) + try: + d={} + d['IMSI']=row[1] + try: + d['IMEI']=row[2] + except: + d['IMEI']="dummy" + d['number']=row[3] + devices[row[0]]=d + senddevice(d) + except: + print "Error: handset with missing fields" except: print "Error: unable to fetch handset list" @@ -133,7 +152,10 @@ def main(): for row in imresults: d={} d['IMSI']=row[1] - d['IMEI']=row[2] + try: + d['IMEI']=row[2] + except: + d['IMEI']="dummy" d['number']=row[3] devices[row[0]]=d print "new IMSI: ",d['IMSI'] @@ -148,4 +170,4 @@ def main(): db.close() -if __name__ == '__main__': main()
\ No newline at end of file +if __name__ == '__main__': main() |