fix basic

This commit is contained in:
2024-11-29 00:32:39 +01:00
parent 274e1e2e59
commit 8479c378ee
3 changed files with 26 additions and 19 deletions
+6 -6
View File
@@ -29,6 +29,7 @@ sys.path.insert(0,os.path.join(tisbackup_root_dir,'libtisbackup'))
import errno
import logging
import os.path
from optparse import OptionParser
from iniparse import ConfigParser, ini
@@ -191,7 +192,7 @@ class tis_backup:
finally:
self.logger.debug('worst nagios status :"%i"',worst_nagiosstatus)
print('%s (tisbackup V%s)' %(nagiosoutput,version))
print('\n'.join(["[%s]:%s" % (l[0],l[1]) for l in globallog]))
print('\n'.join(["[%s]:%s" % (log_elem[0],log_elem[1]) for log_elem in globallog]))
sys.exit(worst_nagiosstatus)
def process_backup(self,sections=[]):
@@ -285,7 +286,6 @@ class tis_backup:
def cleanup_backup_section(self,sections = []):
log = ''
processed = False
if not sections:
sections = [backup_item.backup_name for backup_item in self.backup_list]
@@ -321,9 +321,9 @@ class tis_backup:
(nagiosstatus,log) = backup_item.checknagios(maxage_hours=maxage_hours)
globallog.append('[%s] %s' % (backup_item.backup_name,log))
self.logger.debug('[%s] nagios:"%i" log: %s',backup_item.backup_name,nagiosstatus,log)
processed = True
if nagiosstatus >= worst_nagiosstatus:
worst_nagiosstatus = nagiosstatus
#processed = True
# if nagiosstatus >= worst_nagiosstatus:
# worst_nagiosstatus = nagiosstatus
def main():
@@ -398,7 +398,7 @@ def main():
backup_sections = all_sections
else:
for b in backup_sections:
if not b in all_sections:
if b not in all_sections:
raise Exception('Section %s is not defined in config file' % b)
if dry_run: