From 953da9164a2da44e35c2a2941ec8357f44768f68 Mon Sep 17 00:00:00 2001 From: Triatmoko Date: Wed, 16 Nov 2011 22:11:43 +0100 Subject: trying find SSH bug for new code --- Under-Testing/Server-Code-New/ControllerClass.py | 7 +++++-- Under-Testing/Server-Code-New/gsmselftest.py | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Under-Testing/Server-Code-New/ControllerClass.py b/Under-Testing/Server-Code-New/ControllerClass.py index df89ac5..c5bc29a 100644 --- a/Under-Testing/Server-Code-New/ControllerClass.py +++ b/Under-Testing/Server-Code-New/ControllerClass.py @@ -47,6 +47,7 @@ class controller: sleep(5) self.callerGreeting() + logger.logEvent('Status Handler Connection :'+self.connected) if self.connected == 'OK': self.caller.sendData('CALLER|'+self.destNo) @@ -66,8 +67,9 @@ class controller: else: #waiting 2 seconds if doesnt use ssh connection until handler ready sleep(5) - self.receiverGreeting() - + self.receiverGreeting() + + logger.logEvent('Status Handler Connection :'+self.connected) if self.connected == 'OK': self.receiver.sendData('RECEIVER') @@ -209,6 +211,7 @@ class controller: #open SSH tunneling self.boxCaller = SSHTunnelBoxClass.SSHTunneling(self.portCaller, 50008, self.server, self.username, self.password) status = self.boxCaller.startTunneling() + logger.logEvent('SSH Status :'+str(status)) #check whether the SSH tunneling succes or not, 0 is failed! if status!= 0: diff --git a/Under-Testing/Server-Code-New/gsmselftest.py b/Under-Testing/Server-Code-New/gsmselftest.py index 2bfe7be..21037a5 100644 --- a/Under-Testing/Server-Code-New/gsmselftest.py +++ b/Under-Testing/Server-Code-New/gsmselftest.py @@ -256,7 +256,7 @@ def smartTest(): if int(test[2]) == 200: testCaller = False #if destination have not tested by other part. try to test from RZ GSM - if int(test[2]) == 200: + if int(test[2]) == 200 and founds != True: for caller in cpgsmRZList: if caller == test[0] or caller == test[1]: callFrom = caller @@ -291,7 +291,7 @@ def smartTest(): if test[1] == caller or test[0] == caller: repeatTest = False if int(dest[2]) == 486 or int(dest[2]) == 402: - if repeatTest = True: + if repeatTest == True: callFrom = 'sip' testDest(callFrom, dest[0], 2) rem.append(dest) -- cgit v1.2.3-55-g7522