some cleanups and bug fixes.
This commit is contained in:
parent
e80e50a3db
commit
fbf860e573
6 changed files with 25 additions and 17 deletions
|
|
@ -2,6 +2,7 @@
|
|||
This is what job_function needs as parameter for each job to successfully
|
||||
execute.
|
||||
"""
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
|
||||
|
|
@ -11,6 +12,7 @@ def generateId():
|
|||
yield i
|
||||
i += 1
|
||||
|
||||
|
||||
class Job:
|
||||
def __init__(self, service, host):
|
||||
self.service = service
|
||||
|
|
@ -46,18 +48,17 @@ class Job:
|
|||
jobInfo = JobInfo(self.host, self.service)
|
||||
result = self.service._execute(self.host)
|
||||
jobInfo.set_result(result)
|
||||
jobInfo.set_successfull(self.service.was_execution_successful())
|
||||
jobInfo.set_execution_successful(self.service.was_execution_successful())
|
||||
jobInfo.set_execution_end()
|
||||
|
||||
self.handle_threshold(self.service.get_threshold(), self.service.was_execution_successful())
|
||||
|
||||
|
||||
self.jobInfos.append(jobInfo)
|
||||
|
||||
|
||||
except Exception, e:
|
||||
self.log.d(e)
|
||||
|
||||
|
||||
class JobInfo:
|
||||
def __init__(self, host, service):
|
||||
self.id = generateId()
|
||||
|
|
@ -73,5 +74,3 @@ class JobInfo:
|
|||
|
||||
def set_execution_successful(self, successful):
|
||||
self.executionSuccess = successful
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
'''
|
||||
"""
|
||||
Just the frontends.py stub... ;)
|
||||
|
||||
If linspector is being started without a frontend "enabled" it just is doing stuff like: polling, alerting, logging etc.
|
||||
|
||||
Frontends a absolutely no requirement for running Linspector.
|
||||
'''
|
||||
"""
|
||||
|
||||
|
||||
class Frontends():
|
||||
class Frontend():
|
||||
def __init__(self, **kwargs):
|
||||
return
|
||||
|
|
@ -1,6 +1,13 @@
|
|||
'''
|
||||
"""
|
||||
A HTTPS frontend to the current Linspector instance.
|
||||
|
||||
A Webserver listening for requests to give information about the internal state of linspector.
|
||||
(maybe providing a JSON API to the instance too...)
|
||||
'''
|
||||
"""
|
||||
|
||||
from lib.frontends.frontend import Frontend
|
||||
|
||||
|
||||
class HttpsFrontend(Frontend):
|
||||
def __init__(self, **kwargs):
|
||||
return
|
||||
|
|
@ -1,12 +1,15 @@
|
|||
'''
|
||||
"""
|
||||
The Linspector Interactive Shell...
|
||||
|
||||
This will become an interface to Linspector at "start" time. Think about MidnightCommander... and then run
|
||||
Linspector in a screen session and not as daemon, why not? BTW.: Daemonization is at this point of development
|
||||
cancelled, because it makes no sense to daemonize everything. Linspector is a user software which will run in any
|
||||
screen session perfectly.
|
||||
'''
|
||||
"""
|
||||
|
||||
class LishFrontend(Frontends):
|
||||
from lib.frontends.frontend import Frontend
|
||||
|
||||
|
||||
class LishFrontend(Frontend):
|
||||
def __init__(self, **kwargs):
|
||||
return
|
||||
|
|
@ -27,12 +27,11 @@ class TcpconnectService(Service):
|
|||
try:
|
||||
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
except socket.error, msg:
|
||||
|
||||
#log.w("%s\n" % msg[1])
|
||||
self.errorcode = 1
|
||||
|
||||
try:
|
||||
sock.connect((self.host, self.port))
|
||||
sock.connect((host, self.port))
|
||||
except socket.error, msg:
|
||||
#log.w("%s\n" % msg[1])
|
||||
self.errorcode = 2
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
{
|
||||
"class": "tcpconnect",
|
||||
"args": {"port": 23232},
|
||||
"periods": ["moes_time", "marges_birthday"],
|
||||
"periods": ["doh"],
|
||||
"fails": {"donut": 0},
|
||||
"threshold": 0,
|
||||
"comment": "my personal reminder, hehe"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue