X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2Flogger.py;h=545ac0b8dfbe368f7d2333b23129455ed653dffa;hb=7eaf036289b53a17ebdffc38a449fe23b99ed057;hp=f50ae77e85510555dd0b6eee0bffbe8d8023fe92;hpb=0c8ade519224c4058dbc5ae60441269226a5a209;p=tools%2Fsat.git diff --git a/src/logger.py b/src/logger.py index f50ae77..545ac0b 100755 --- a/src/logger.py +++ b/src/logger.py @@ -22,6 +22,7 @@ Implements the classes and method relative to the logging import sys import os +import stat import datetime import re import tempfile @@ -36,6 +37,8 @@ import src.debug as DBG log_macro_command_file_expression = "^[0-9]{8}_+[0-9]{6}_+.*\.xml$" log_all_command_file_expression = "^.*[0-9]{8}_+[0-9]{6}_+.*\.xml$" +verbose = True # cvw TODO + class Logger(object): """\ Class to handle log mechanism. @@ -70,8 +73,22 @@ class Logger(object): # the external commands calls (cmake, make, git clone, etc...) txtFileName = prefix + hour_command_host + ".txt" txtFilePath = os.path.join(log_dir, "OUT", txtFileName) - - src.ensure_path_exists(os.path.dirname(logFilePath)) + + aDirLog = os.path.dirname(logFilePath) + if not os.path.exists(aDirLog): + print("create log dir %s" % aDirLog) + src.ensure_path_exists(aDirLog) + # sometimes other users make 'sat log' and create hat.xml file... + os.chmod(aDirLog, + stat.S_IRUSR | + stat.S_IRGRP | + stat.S_IROTH | + stat.S_IWUSR | + stat.S_IWGRP | + stat.S_IWOTH | + stat.S_IXUSR | + stat.S_IXGRP | + stat.S_IXOTH) src.ensure_path_exists(os.path.dirname(txtFilePath)) # The path of the log files (one for sat traces, and the other for @@ -117,7 +134,7 @@ class Logger(object): self.config.VARS.command}) # version of salomeTools self.xmlFile.append_node_attrib("Site", attrib={"satversion" : - self.config.INTERNAL.sat_version}) + src.get_salometool_version(self.config)}) # machine name on which the command has been launched self.xmlFile.append_node_attrib("Site", attrib={"hostname" : self.config.VARS.hostname}) @@ -129,7 +146,7 @@ class Logger(object): self.config.VARS.user}) # The time when command was launched Y, m, dd, H, M, S = date_to_datetime(self.config.VARS.datehour) - date_hour = "%2s/%2s/%4s %2sh%2sm%2ss" % (dd, m, Y, H, M, S) + date_hour = "%4s/%2s/%2s %2sh%2sm%2ss" % (Y, m, dd, H, M, S) self.xmlFile.append_node_attrib("Site", attrib={"beginTime" : date_hour}) # The application if any @@ -161,7 +178,7 @@ class Logger(object): """ xmlLinks = self.xmlFile.xmlroot.find("Links") flc = src.xmlManager.escapeSequence(full_launched_command) - att = {"command" : command_name, "passed" : command_res, "launchedCommand" : flc} + att = {"command" : command_name, "passed" : str(command_res), "launchedCommand" : flc} src.xmlManager.add_simple_node(xmlLinks, "link", text = log_file_name, attrib = att) def write(self, message, level=None, screenOnly=False): @@ -201,20 +218,57 @@ class Logger(object): sys.stdout.write(message) self.flush() - def error(self, message): - """Print an error. - - :param message str: The message to print. - """ - # Print in the log file - self.xmlFile.append_node_text("traces", _('ERROR:') + message) + def error(self, message, prefix="ERROR: "): + """Print an error. + + :param message str: The message to print. + """ + # Print in the log file + self.xmlFile.append_node_text("traces", prefix + message) + + # Print in the terminal and clean colors if the terminal + # is redirected by user + if not ('isatty' in dir(sys.stderr) and sys.stderr.isatty()): + sys.stderr.write(printcolors.printcError(prefix + message + "\n")) + else: + sys.stderr.write(prefix + message + "\n") + + def step(self, message): + """Print an step message. + + :param message str: The message to print. + """ + self.write('STEP: ' + message, level=4) + + def trace(self, message): + """Print an trace message. + + :param message str: The message to print. + """ + self.write('TRACE: ' + message, level=5) + + def debug(self, message): + """Print an debug message. + + :param message str: The message to print. + """ + self.write('DEBUG: ' + message, level=6) + + def warning(self, message): + """Print an warning message. + + :param message str: The message to print. + """ + self.error(message, prefix="WARNING: ") + + def critical(self, message): + """Print an critical message. + + :param message str: The message to print. + """ + self.error(message, prefix="CRITICAL: ") + - # Print in the terminal and clean colors if the terminal - # is redirected by user - if not ('isatty' in dir(sys.stderr) and sys.stderr.isatty()): - sys.stderr.write(printcolors.printcError(_('ERROR:') + message)) - else: - sys.stderr.write(_('ERROR:') + message) def flush(self): """Flush terminal""" @@ -345,17 +399,22 @@ def show_command_log(logFilePath, cmd, application, notShownCommands): sys.stdout.write(printcolors.printcWarning("%s\n%s\n" % (msg, e))) return False, None, None - if 'application' in logFileXml.xmlroot.keys(): - appliLog = logFileXml.xmlroot.get('application') - launched_cmd = logFileXml.xmlroot.find('Site').attrib['launchedCommand'] - # if it corresponds, then the log has to be shown - if appliLog == application: - return True, appliLog, launched_cmd - elif application != 'None': - return False, appliLog, launched_cmd - - return True, appliLog, launched_cmd - + try: + if 'application' in logFileXml.xmlroot.keys(): + appliLog = logFileXml.xmlroot.get('application') + launched_cmd = logFileXml.xmlroot.find('Site').attrib['launchedCommand'] + # if it corresponds, then the log has to be shown + if appliLog == application: + return True, appliLog, launched_cmd + elif application != 'None': + return False, appliLog, launched_cmd + + return True, appliLog, launched_cmd + except Exception as e: + msg = _("WARNING: the log file %s cannot be parsed:" % logFilePath) + sys.stdout.write(printcolors.printcWarning("%s\n%s\n" % (msg, e))) + return False, None, None + if application == 'None': return True, None, None @@ -413,8 +472,7 @@ def update_hat_xml(logDir, application=None, notShownCommands = []): """ # Create an instance of XmlLogFile class to create hat.xml file xmlHatFilePath = os.path.join(logDir, 'hat.xml') - xmlHat = src.xmlManager.XmlLogFile(xmlHatFilePath, - "LOGlist", {"application" : application}) + xmlHat = src.xmlManager.XmlLogFile(xmlHatFilePath, "LOGlist", {"application" : application}) # parse the log directory to find all the command logs, # then add it to the xml file lLogFile = list_log_file(logDir, log_macro_command_file_expression) @@ -434,6 +492,15 @@ def update_hat_xml(logDir, application=None, notShownCommands = []): # Write the file on the hard drive xmlHat.write_tree('hat.xsl') + # Sometimes other users will make 'sat log' and update this file + os.chmod(xmlHatFilePath, + stat.S_IRUSR | + stat.S_IRGRP | + stat.S_IROTH | + stat.S_IWUSR | + stat.S_IWGRP | + stat.S_IWOTH ) + # TODO for future @@ -468,7 +535,7 @@ def setCurrentLogger(logger): """temporary send all in stdout as simple logging logger""" if len(_currentLogger) == 0: _currentLogger.append(logger) - logger.warning("set current logger as %s" % logger.name) + logger.debug("set current logger as %s" % logger.name) else: if _currentLogger[0].name != logger.name: # logger.debug("quit current logger as default %s" % _currentLogger[0].name) @@ -482,7 +549,7 @@ def isCurrentLoggerUnittest(): res = True else: res = False - DBG.write("isCurrentLoggerUnittest %s" % logger.name, res) + #DBG.write("isCurrentLoggerUnittest %s" % logger.name, res) return res def sendMessageToCurrentLogger(message, level):