x/python-redfish
Code Issues Proposed changes

Merge pull request #28 from uggla/check_logdir

Browse Source 
Log file improvement + little fix
This commit is contained in:
Bruno Cornec 2016-03-07 01:18:08 +01:00
commit 783dea2e57
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
redfish-client/redfish-client
View File

@ -24,7 +24,7 @@ redfish-client ::
--insecure Ignore SSL certificates --insecure Ignore SSL certificates
--debug LEVEL Run in debug mode, LEVEL from 1 to 3 increase verbosity --debug LEVEL Run in debug mode, LEVEL from 1 to 3 increase verbosity
Security warning LEVEL > 1 could reveal password into the logs Security warning LEVEL > 1 could reveal password into the logs
--debugfile FILE Specify the client debugfile [default: redfish-client.log] --debugfile FILE Specify the client debugfile [default: /var/log/python-redfish/redfish-client.log]
--libdebugfile FILE Specify python-redfish library log file [default: /var/log/python-redfish/python-redfish.log] --libdebugfile FILE Specify python-redfish library log file [default: /var/log/python-redfish/python-redfish.log]
config commands : manage the configuration file. config commands : manage the configuration file.
@ -253,6 +253,7 @@ if __name__ == '__main__':
enforceSSL=enforceSSL enforceSSL=enforceSSL
) )
except redfish.exception.RedfishException as e: except redfish.exception.RedfishException as e:
logger.error(str(e.message))
sys.stderr.write(str(e.message)) sys.stderr.write(str(e.message))
sys.stderr.write(str(e.advices)) sys.stderr.write(str(e.advices))
sys.exit(1) sys.exit(1)
@ -263,7 +264,7 @@ if __name__ == '__main__':
except jinja2.exceptions.TemplateNotFound as e: except jinja2.exceptions.TemplateNotFound as e:
print('Template "{}" not found in {}.' print('Template "{}" not found in {}.'
.format(e.message, jinja2_env.loader.searchpath[0])) .format(e.message, jinja2_env.loader.searchpath[0]))
logger.debug('Template "%s" not found in %s.' logger.error('Template "%s" not found in %s.'
% (e.message, jinja2_env.loader.searchpath[0])) % (e.message, jinja2_env.loader.searchpath[0]))
sys.exit(1) sys.exit(1)
@ -332,7 +333,8 @@ if __name__ == '__main__':
HOME = os.getenv('HOME') HOME = os.getenv('HOME')
if(not HOME): if(not HOME):
print('$HOME environment variable not set, please check your system') print('ERROR: $HOME environment variable not set,' +
'please check your system')
logger.error('$HOME environment variable not set') logger.error('$HOME environment variable not set')
sys.exit(1) sys.exit(1)
logger.debug("Home directory : %s" % HOME) logger.debug("Home directory : %s" % HOME)
@ -343,7 +345,7 @@ if __name__ == '__main__':
configfile = 'PBCONFFILE' configfile = 'PBCONFFILE'
if(arguments['--config']): if(arguments['--config']):
configfile = [arguments['--config']] configfile = arguments['--config']
logger.debug("Overwrite configuration specified by user at %s" logger.debug("Overwrite configuration specified by user at %s"
% configfile) % configfile)
@ -423,5 +425,5 @@ if __name__ == '__main__':
else: else:
get_manager_info(manager_name, True) get_manager_info(manager_name, True)
logger.info("Client session teminated") logger.info("Client session terminated")
sys.exit(0) sys.exit(0)

13
redfish/config.py
View File

@ -1,6 +1,9 @@
# coding=utf-8 # coding=utf-8
import logging import logging
import sys
import os
import getpass
from logging.handlers import RotatingFileHandler from logging.handlers import RotatingFileHandler
# Global variable definition # Global variable definition
@ -34,7 +37,15 @@ def initialize_logger(REDFISH_LOGFILE,
formatter = logging.Formatter( formatter = logging.Formatter(
'%(asctime)s :: %(levelname)s :: %(message)s' '%(asctime)s :: %(levelname)s :: %(message)s'
) )
file_handler = RotatingFileHandler(REDFISH_LOGFILE, 'a', 1000000, 1) try:
file_handler = RotatingFileHandler(REDFISH_LOGFILE, 'a', 1000000, 1)
except IOError:
print('ERROR: {} does not exist or is not writeable.\n'.format(REDFISH_LOGFILE))
print('1- Try to create directory {}'.format(os.path.dirname(REDFISH_LOGFILE)))
print(' using: sudo mkdir -p {}'.format(os.path.dirname(REDFISH_LOGFILE)))
print('2- Try to get the {} ownership'.format(os.path.dirname(REDFISH_LOGFILE)))
print(' using: sudo chown {} {}'.format(getpass.getuser(), os.path.dirname(REDFISH_LOGFILE)))
sys.exit(1)
# First logger to file # First logger to file
file_handler.setLevel(FILE_LOGGER_LEVEL) file_handler.setLevel(FILE_LOGGER_LEVEL)