linspector/linspector-old
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Rafael.Timmerberg 2013-08-15 02:24:17 +02:00
commit a12a225580
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/core/job.py
View file

@ -33,11 +33,13 @@ class Job:
def handle_threshold(self, serviceThreshold, executionSucessful): def handle_threshold(self, serviceThreshold, executionSucessful):
if executionSucessful: if executionSucessful:
pass if self.jobThreshold > 0:
self.jobThreshold -= 1
else: else:
self.jobThreshold += 1 self.jobThreshold += 1
if self.jobThreshold >= serviceThreshold: if self.jobThreshold >= serviceThreshold:
self.log.d("ARGGHHH!!")
self.handle_alarm(self.jobThreshold-serviceThreshold) self.handle_alarm(self.jobThreshold-serviceThreshold)
def handle_alarm(self, threholdOffset): def handle_alarm(self, threholdOffset):

12
lib/services/tcpconnect.py
View file

@ -11,7 +11,6 @@ from lib.services.service import Service
class TcpconnectService(Service): class TcpconnectService(Service):
def __init__(self, **kwargs): def __init__(self, **kwargs):
#Service.__init__(self, **kwargs)
super(TcpconnectService, self).__init__(**kwargs) super(TcpconnectService, self).__init__(**kwargs)
args = self.get_arguments() args = self.get_arguments()
@ -28,19 +27,24 @@ class TcpconnectService(Service):
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
except socket.error, msg: except socket.error, msg:
jobInfo.set_errorcode(1) jobInfo.set_errorcode(1)
jobInfo.set_message("Could not create socket to host: " + jobInfo.get_host() + " to port: " + str(self.port) + " (" + str(msg) + ")") jobInfo.set_message("Could not create socket to host: " + jobInfo.get_host() + " to port: " +
str(self.port) + " (" + str(msg) + ")")
try: try:
sock.connect((jobInfo.get_host(), self.port)) sock.connect((jobInfo.get_host(), self.port))
except socket.error, msg: except socket.error, msg:
jobInfo.set_errorcode(2) jobInfo.set_errorcode(2)
jobInfo.set_message("Could not establish connection to host: " + jobInfo.get_host() + " to port: " + str(self.port) + " (" + str(msg) + ")") jobInfo.set_message("Could not establish connection to host: " + jobInfo.get_host() + " to port: " +
str(self.port) + " (" + str(msg) + ")")
if jobInfo.get_errorcode() == -1: if jobInfo.get_errorcode() == -1:
jobInfo.set_execution_successful(True) jobInfo.set_execution_successful(True)
jobInfo.set_errorcode(0) jobInfo.set_errorcode(0)
jobInfo.set_message("Connection successful established to host: " + jobInfo.get_host() + " to port: " + str(self.port)) jobInfo.set_message("Connection successful established to host: " + jobInfo.get_host() + " to port: " +
str(self.port))
sock.close() sock.close()
def create(kwargs): def create(kwargs):
return TcpconnectService(**kwargs) return TcpconnectService(**kwargs)