summaryrefslogtreecommitdiffstats
path: root/Under-Testing/Server-Code-New/GSMHandler.py
diff options
context:
space:
mode:
authorTriatmoko2011-11-17 04:24:51 +0100
committerTriatmoko2011-11-17 04:24:51 +0100
commit25128f34cdfae5318d1a38441bf09781ef91a2ba (patch)
tree004e2ee7c744b10acf024e945008d472dc8f03d0 /Under-Testing/Server-Code-New/GSMHandler.py
parentdelete unused files (diff)
downloadgsm-selftest-25128f34cdfae5318d1a38441bf09781ef91a2ba.tar.gz
gsm-selftest-25128f34cdfae5318d1a38441bf09781ef91a2ba.tar.xz
gsm-selftest-25128f34cdfae5318d1a38441bf09781ef91a2ba.zip
update loging files for every handler and fic device configuration function
Diffstat (limited to 'Under-Testing/Server-Code-New/GSMHandler.py')
-rw-r--r--Under-Testing/Server-Code-New/GSMHandler.py30
1 files changed, 14 insertions, 16 deletions
diff --git a/Under-Testing/Server-Code-New/GSMHandler.py b/Under-Testing/Server-Code-New/GSMHandler.py
index e964635..7cfcfb1 100644
--- a/Under-Testing/Server-Code-New/GSMHandler.py
+++ b/Under-Testing/Server-Code-New/GSMHandler.py
@@ -20,10 +20,9 @@ def openFile():
global portListen
global portAddress
- #String format:
- # textFile = 'Account:username:password:server:handler:PortName:portCaller
-
- reader = csv.reader(open('handler.txt'), delimiter=':')
+ #String format: 'Account:username:password:server:handler:PortName:portCaller
+ File = open('handler.txt')
+ reader = csv.reader(File, delimiter=':')
for row in reader:
if str(row[0]) == 'Account':
#username = str(row[1])
@@ -32,8 +31,7 @@ def openFile():
handler = str(row[4])
portAddress = str(row[5])
portListen = int(row[6])
-
- #print 'this:', row
+ File.close()
baudRate = 19200
@@ -82,13 +80,13 @@ def initSystem():
anyConnection = handlerSocket.openSocket()
try :
- logger.logEvent('we are here')
+ logger.logEvent('Trying connect to the device')
gsmDevice = GSMClass.serialPort(portAddress, baudRate, 15)
initDevice = gsmDevice.portInit(5)
logger.logEvent('init device ' + str(initDevice))
except ValueError:
- logger.logEvent('Error MAN')
+ logger.logEvent('Failure when trying connect to device')
########################################################
@@ -245,12 +243,10 @@ def receiveStart():
callSuccess = 'CALL OK'
else:
callSuccess = 'CALL NOT OK'
-
-
-
- sendMessage = handlerSocket.sendData(callSuccess)
if deviceError==0:
- tryHangUp = gsmDevice.hangUp()
+ tryHangUp = gsmDevice.hangUp()
+ sendMessage = handlerSocket.sendData(callSuccess)
+
return sendMessage
############################
@@ -304,10 +300,12 @@ def callStart(numberToCall):
else:
callSuccess = 'CALL NOT OK'
- handResponse = handlerSocket.sendData(callSuccess)
-
if deviceError==0:
- tryHangUp = gsmDevice.hangUp()
+ try:
+ tryHangUp = gsmDevice.hangUp()
+ except ValueError:
+ print 'Error when try hangup the call'
+ handResponse = handlerSocket.sendData(callSuccess)
return handResponse
#########################