Change: no log exclusions by default, clearer size message

This commit is contained in:
f3flight 2016-09-08 12:19:52 +00:00
parent 0a699de54f
commit b2518b286c
3 changed files with 6 additions and 4 deletions

View File

@ -94,8 +94,8 @@ scripts:
logs: logs:
__default: __default:
path: '/var/log' path: '/var/log'
exclude: # exclude:
- '\.[^12]\.gz$|\.\d{2,}\.gz$' # - '\.[^12]\.gz$|\.\d{2,}\.gz$'
# cmds: # cmds:
# __default: # __default:
# test: # test:

View File

@ -307,7 +307,9 @@ def main(argv=None):
has_logs = False has_logs = False
else: else:
has_logs = True has_logs = True
print('Total logs size to collect: %dMB.' % (size/1024/1024)) print(('Total logs size to collect before compression: %dMB.\n'
'Compressed logs will take less space.') % (size/1048576))
print('Log collection period: %s days.' % conf['logs_days'])
enough_space = pretty_run(args.quiet, 'Checking free space', enough_space = pretty_run(args.quiet, 'Checking free space',
nm.is_enough_space) nm.is_enough_space)
if not enough_space: if not enough_space:

View File

@ -16,7 +16,7 @@
# under the License. # under the License.
project_name = 'timmy' project_name = 'timmy'
version = '1.19.4' version = '1.19.5'
if __name__ == '__main__': if __name__ == '__main__':
import sys import sys