pretty job string function for lish, fixed logging

TODO: set Logging levels
This commit is contained in:
Rafael.Timmerberg 2013-10-10 21:46:29 +02:00
commit 0a8dd894ab
4 changed files with 22 additions and 6 deletions

View file

@ -47,7 +47,7 @@ KEY_CORE = "core"
class ConfigurationException(Exception):
def __init__(self, msg, log):
log.e(msg)
log.error(msg)
self.msg = msg
def __str__(self):

View file

@ -21,6 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
from datetime import datetime
from binascii import crc32
def generateId():
@ -43,9 +44,22 @@ class Job:
def __str__(self):
return str(self.__dict__)
def __hex__(self):
return hex(crc32(str(self.service) + str(self.host) + str(self.members)))
def set_logger(self, log):
self.log = log
def pretty_string(self):
ret = self.__hex__()
if ret[0] == "-":
ret = ret[1:]
ret += ": (" + str(self.host) + str(self.service) + str(self.job) + ")"
return ret[2:]
def set_job(self, job):
self.job = job

View file

@ -164,7 +164,7 @@ class LishCommander(Exit, ShellCommander, LogCommander):
try:
hgCommander = HostgroupCommander(hg)
hgCommander.cmdloop("Entering Hostmode of " + hgName + ":\n")
except KeyboardInterrupt, ke:
except KeyboardInterrupt, key:
pass
def do_python(self, text):
@ -172,8 +172,8 @@ class LishCommander(Exit, ShellCommander, LogCommander):
def do_jobs(self, text):
if text == "list":
for job in self._scheduler.get_jobs():
print job
for job in self._jobs:
print job.pretty_string()
def help_jobs(self):
print "Job helper functions"