mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

log: add extra try except when removing log dirs and fix eni.d cp

Browse Source 
The extra try/except are necessary just in case something goes wrong
we still want to go through the entire list of extra log dir present
on the system.

Signed-off-by: Julien Fortin <jfortin@nvidia.com>
This commit is contained in:
Julien Fortin
2021-12-28 22:47:48 +01:00
parent 29ed5855ba
commit dd29350f7f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ifupdown2/lib/log.py
View File

@ -193,16 +193,19 @@ class LogManager:
# cp ENI and ENI.d in the log directory # cp ENI and ENI.d in the log directory
shutil.copy2("/etc/network/interfaces", new_dir_path) shutil.copy2("/etc/network/interfaces", new_dir_path)
try: try:
shutil.copytree("/etc/network/interfaces.d/", new_dir_path) shutil.copytree("/etc/network/interfaces.d/", "%s/interfaces.d" % new_dir_path)
except FileNotFoundError: except Exception:
pass pass
# remove extra directory logs if we are reaching the 'user_config_limit' # remove extra directory logs if we are reaching the 'user_config_limit'
len_ifupdown2_log_dirs = len(ifupdown2_log_dirs) len_ifupdown2_log_dirs = len(ifupdown2_log_dirs)
if len_ifupdown2_log_dirs > user_config_limit: if len_ifupdown2_log_dirs > user_config_limit:
for index in range(0, len_ifupdown2_log_dirs - user_config_limit): for index in range(0, len_ifupdown2_log_dirs - user_config_limit):
directory_to_remove = "%s/%s%s_%s" % (self.LOGGING_DIRECTORY, self.LOGGING_DIRECTORY_PREFIX, ifupdown2_log_dirs[index][0], ifupdown2_log_dirs[index][1]) try:
shutil.rmtree(directory_to_remove, ignore_errors=True) directory_to_remove = "%s/%s%s_%s" % (self.LOGGING_DIRECTORY, self.LOGGING_DIRECTORY_PREFIX, ifupdown2_log_dirs[index][0], ifupdown2_log_dirs[index][1])
shutil.rmtree(directory_to_remove, ignore_errors=True)
except:
pass
@staticmethod @staticmethod
def __create_dir(path): def __create_dir(path):