mirror of
https://github.com/Telecominfraproject/ols-nos.git
synced 2025-11-02 02:57:45 +00:00
[Python] Align files in root dir, dockers/ and files/ with PEP8 standards (#6109)
**- Why I did it** Align style with slightly modified PEP8 standards (extend maximum line length to 120 chars). This will also help in the transition to Python 3, where it is more strict about whitespace, plus it helps unify style among the SONiC codebase. Will tackle other directories in separate PRs. **- How I did it** Using `autopep8 --in-place --max-line-length 120` and some manual tweaks.
This commit is contained in:
@@ -10,6 +10,7 @@ SYSLOG_IDENTIFIER = 'core_cleanup.py'
|
||||
CORE_FILE_DIR = '/var/core/'
|
||||
MAX_CORE_FILES = 4
|
||||
|
||||
|
||||
def main():
|
||||
logger = Logger(SYSLOG_IDENTIFIER)
|
||||
logger.set_min_log_priority_info()
|
||||
@@ -28,7 +29,7 @@ def main():
|
||||
curr_files.append(f)
|
||||
|
||||
if len(curr_files) > MAX_CORE_FILES:
|
||||
curr_files.sort(reverse = True, key = lambda x: datetime.utcfromtimestamp(int(x.split('.')[1])))
|
||||
curr_files.sort(reverse=True, key=lambda x: datetime.utcfromtimestamp(int(x.split('.')[1])))
|
||||
oldest_core = curr_files[MAX_CORE_FILES]
|
||||
logger.log_info('Deleting {}'.format(oldest_core))
|
||||
try:
|
||||
@@ -39,5 +40,6 @@ def main():
|
||||
|
||||
logger.log_info('Finished cleaning up core files')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
||||
@@ -21,6 +21,8 @@ CRITICAL_PROCESSES_FILE = '/etc/supervisor/critical_processes'
|
||||
FEATURE_TABLE_NAME = 'FEATURE'
|
||||
|
||||
# Read the critical processes/group names from CRITICAL_PROCESSES_FILE
|
||||
|
||||
|
||||
def get_critical_group_and_process_list():
|
||||
critical_group_list = []
|
||||
critical_process_list = []
|
||||
@@ -29,7 +31,8 @@ def get_critical_group_and_process_list():
|
||||
for line in file:
|
||||
line_info = line.strip(' \n').split(':')
|
||||
if len(line_info) != 2:
|
||||
syslog.syslog(syslog.LOG_ERR, "Syntax of the line {} in critical_processes file is incorrect. Exiting...".format(line))
|
||||
syslog.syslog(syslog.LOG_ERR,
|
||||
"Syntax of the line {} in critical_processes file is incorrect. Exiting...".format(line))
|
||||
sys.exit(5)
|
||||
|
||||
identifier_key = line_info[0].strip()
|
||||
@@ -39,11 +42,13 @@ def get_critical_group_and_process_list():
|
||||
elif identifier_key == "program" and identifier_value:
|
||||
critical_process_list.append(identifier_value)
|
||||
else:
|
||||
syslog.syslog(syslog.LOG_ERR, "Syntax of the line {} in critical_processes file is incorrect. Exiting...".format(line))
|
||||
sys.exit(6)
|
||||
syslog.syslog(syslog.LOG_ERR,
|
||||
"Syntax of the line {} in critical_processes file is incorrect. Exiting...".format(line))
|
||||
sys.exit(6)
|
||||
|
||||
return critical_group_list, critical_process_list
|
||||
|
||||
|
||||
def main(argv):
|
||||
container_name = None
|
||||
opts, args = getopt.getopt(argv, "c:", ["container-name="])
|
||||
@@ -90,13 +95,14 @@ def main(argv):
|
||||
|
||||
restart_feature = features_table[container_name].get('auto_restart')
|
||||
if not restart_feature:
|
||||
syslog.syslog(syslog.LOG_ERR, "Unable to determine auto-restart feature status for '{}'. Exiting...".format(container_name))
|
||||
syslog.syslog(
|
||||
syslog.LOG_ERR, "Unable to determine auto-restart feature status for '{}'. Exiting...".format(container_name))
|
||||
sys.exit(4)
|
||||
|
||||
# If auto-restart feature is not disabled and at the same time
|
||||
# a critical process exited unexpectedly, terminate supervisor
|
||||
if (restart_feature != 'disabled' and expected == 0 and
|
||||
(processname in critical_process_list or groupname in critical_group_list)):
|
||||
(processname in critical_process_list or groupname in critical_group_list)):
|
||||
MSG_FORMAT_STR = "Process {} exited unxepectedly. Terminating supervisor..."
|
||||
msg = MSG_FORMAT_STR.format(payload_headers['processname'])
|
||||
syslog.syslog(syslog.LOG_INFO, msg)
|
||||
|
||||
@@ -11,59 +11,58 @@ chassis_db = 'CHASSIS_APP_DB'
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description=
|
||||
"Update chassis_db config from database-config.json")
|
||||
parser = argparse.ArgumentParser(description="Update chassis_db config from database-config.json")
|
||||
parser.add_argument("-j", "--json", help="databse-config json file", nargs='?',
|
||||
const=database_config_file)
|
||||
parser.add_argument("-p", "--port", help="update port number", nargs='?' )
|
||||
const=database_config_file)
|
||||
parser.add_argument("-p", "--port", help="update port number", nargs='?')
|
||||
group = parser.add_mutually_exclusive_group()
|
||||
group.add_argument("-k", "--keep", help="keep configuration", action='store_true' )
|
||||
group.add_argument("-d", "--delete", help="delete configuration", action='store_true' )
|
||||
group.add_argument("-k", "--keep", help="keep configuration", action='store_true')
|
||||
group.add_argument("-d", "--delete", help="delete configuration", action='store_true')
|
||||
|
||||
args = parser.parse_args()
|
||||
jsonfile = ""
|
||||
if args.json != None:
|
||||
jsonfile = args.json
|
||||
else:
|
||||
return
|
||||
return
|
||||
if args.port != None:
|
||||
port_number = args.port
|
||||
else:
|
||||
port_number = ""
|
||||
if args.keep:
|
||||
keep_config = True
|
||||
keep_config = True
|
||||
else:
|
||||
keep_config = False
|
||||
keep_config = False
|
||||
if args.delete:
|
||||
delete_config = True
|
||||
delete_config = True
|
||||
else:
|
||||
delete_config = False
|
||||
delete_config = False
|
||||
data = {}
|
||||
data_keep = {}
|
||||
if os.path.isfile(jsonfile):
|
||||
with open(jsonfile, "r") as read_file:
|
||||
data = json.load(read_file)
|
||||
else:
|
||||
syslog.syslog(syslog.LOG_ERR,
|
||||
'config file {} does notexist'.format(jsonfile))
|
||||
return
|
||||
syslog.syslog(syslog.LOG_ERR,
|
||||
'config file {} does notexist'.format(jsonfile))
|
||||
return
|
||||
if 'INSTANCES' in data and redis_chassis in data['INSTANCES']:
|
||||
data_keep['INSTANCES'] = {}
|
||||
data_keep['INSTANCES'][redis_chassis] = data['INSTANCES'][redis_chassis]
|
||||
if delete_config:
|
||||
del data['INSTANCES'][redis_chassis]
|
||||
data_keep['INSTANCES'] = {}
|
||||
data_keep['INSTANCES'][redis_chassis] = data['INSTANCES'][redis_chassis]
|
||||
if delete_config:
|
||||
del data['INSTANCES'][redis_chassis]
|
||||
if 'DATABASES' in data and chassis_db in data['DATABASES']:
|
||||
data_keep['DATABASES'] = {}
|
||||
data_keep['DATABASES'][chassis_db] = data['DATABASES'][chassis_db]
|
||||
if delete_config:
|
||||
del data['DATABASES'][chassis_db]
|
||||
data_keep['DATABASES'] = {}
|
||||
data_keep['DATABASES'][chassis_db] = data['DATABASES'][chassis_db]
|
||||
if delete_config:
|
||||
del data['DATABASES'][chassis_db]
|
||||
with open(jsonfile, "w") as write_file:
|
||||
data_publish = data_keep if keep_config else data
|
||||
if port_number:
|
||||
data_publish['INSTANCES']['redis_chassis']['port'] = int(port_number)
|
||||
json.dump(data_publish, write_file, indent=4, separators=(',', ': '))
|
||||
data_publish = data_keep if keep_config else data
|
||||
if port_number:
|
||||
data_publish['INSTANCES']['redis_chassis']['port'] = int(port_number)
|
||||
json.dump(data_publish, write_file, indent=4, separators=(',', ': '))
|
||||
syslog.syslog(syslog.LOG_INFO,
|
||||
'remove chassis_db from config file {}'.format(jsonfile))
|
||||
'remove chassis_db from config file {}'.format(jsonfile))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
Reference in New Issue
Block a user