Compare commits
10 Commits
Author | SHA1 | Date | |
---|---|---|---|
1290623456
|
|||
2a91a41ede
|
|||
46eed410f0
|
|||
2340a2f601
|
|||
bc055a8dfa
|
|||
97530e624a
|
|||
d1d9c3ca15
|
|||
3d6997b3be
|
|||
ac712da881
|
|||
89a19edd6d
|
21
bin/zsnapper
21
bin/zsnapper
@ -5,6 +5,7 @@ import os
|
|||||||
import re
|
import re
|
||||||
import logging
|
import logging
|
||||||
import logging.handlers
|
import logging.handlers
|
||||||
|
import stat
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
@ -258,7 +259,7 @@ def weed_snapshots(fslist, snapshots, config, failed_snapshots):
|
|||||||
continue
|
continue
|
||||||
if source_fs not in snapshots:
|
if source_fs not in snapshots:
|
||||||
continue
|
continue
|
||||||
if not conf['weed_enable']:
|
if not conf['weed_enable'] or conf['weed_enable'].lower() in ('false', 'no'):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
kwargs = {k: int(v) for k, v in conf.items() if k in [
|
kwargs = {k: int(v) for k, v in conf.items() if k in [
|
||||||
@ -288,7 +289,8 @@ def weed_snapshots(fslist, snapshots, config, failed_snapshots):
|
|||||||
|
|
||||||
def main():
|
def main():
|
||||||
config = configparser.ConfigParser()
|
config = configparser.ConfigParser()
|
||||||
config.read('/etc/zsnapper.ini')
|
config.read(['/usr/local/etc/zsnapper.ini', '/etc/zsnapper.ini'])
|
||||||
|
|
||||||
ret = RET_CODES['SUCCESS']
|
ret = RET_CODES['SUCCESS']
|
||||||
log = logging.getLogger(LOGGER)
|
log = logging.getLogger(LOGGER)
|
||||||
|
|
||||||
@ -403,9 +405,22 @@ if __name__ == '__main__':
|
|||||||
handler.setLevel(logging.WARNING)
|
handler.setLevel(logging.WARNING)
|
||||||
log.addHandler(handler)
|
log.addHandler(handler)
|
||||||
|
|
||||||
handler = logging.handlers.SysLogHandler(address='/dev/log')
|
handler = None
|
||||||
|
for logsocket in ('/var/run/log', '/dev/log'):
|
||||||
|
try:
|
||||||
|
mode = os.stat(logsocket).st_mode
|
||||||
|
except FileNotFoundError:
|
||||||
|
continue
|
||||||
|
|
||||||
|
if stat.S_ISSOCK(mode):
|
||||||
|
handler = logging.handlers.SysLogHandler(address=logsocket)
|
||||||
formatter = logging.Formatter(fmt='zsnapper[%(process)s] %(message)s')
|
formatter = logging.Formatter(fmt='zsnapper[%(process)s] %(message)s')
|
||||||
handler.setFormatter(formatter)
|
handler.setFormatter(formatter)
|
||||||
handler.setLevel(logging.INFO)
|
handler.setLevel(logging.INFO)
|
||||||
log.addHandler(handler)
|
log.addHandler(handler)
|
||||||
|
break
|
||||||
|
|
||||||
|
if not handler:
|
||||||
|
log.warning('No syslog socket found, will not log to syslog')
|
||||||
|
|
||||||
sys.exit(main())
|
sys.exit(main())
|
||||||
|
2
setup.py
2
setup.py
@ -6,7 +6,7 @@ try:
|
|||||||
except ImportError:
|
except ImportError:
|
||||||
from distutils import setup
|
from distutils import setup
|
||||||
|
|
||||||
version = '0.3'
|
version = '0.3.4'
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
name='zsnapper',
|
name='zsnapper',
|
||||||
|
@ -6,6 +6,7 @@ import sys
|
|||||||
|
|
||||||
time_format='%Y-%m-%d_%H%M'
|
time_format='%Y-%m-%d_%H%M'
|
||||||
re_snapshot = re.compile(r'^(.*)@([0-9]{4}-[0-9]{2}-[0-9]{2}_[0-9]{4})$')
|
re_snapshot = re.compile(r'^(.*)@([0-9]{4}-[0-9]{2}-[0-9]{2}_[0-9]{4})$')
|
||||||
|
re_err_ok = re.compile(r"cannot create snapshot '[^']+': dataset already exists")
|
||||||
logger = 'zsnapper'
|
logger = 'zsnapper'
|
||||||
|
|
||||||
class ZFSSnapshotError(Exception):
|
class ZFSSnapshotError(Exception):
|
||||||
@ -33,7 +34,12 @@ def do_zfs_command(args, zfs_cmd, pipecmd=None):
|
|||||||
|
|
||||||
(out, err) = ctrl_proc.communicate()
|
(out, err) = ctrl_proc.communicate()
|
||||||
|
|
||||||
if ctrl_proc.returncode != 0:
|
# check if we try to create a snapshot that already exists. This can happen
|
||||||
|
# if the script is run every minute and it takes more time than that to
|
||||||
|
# create all snapshots
|
||||||
|
if ctrl_proc.returncode == 1 and re.match(re_err_ok, err.decode('utf-8')):
|
||||||
|
pass
|
||||||
|
elif ctrl_proc.returncode != 0:
|
||||||
raise ZFSSnapshotError('Failed to execute {}: {}'.format(cmd, err))
|
raise ZFSSnapshotError('Failed to execute {}: {}'.format(cmd, err))
|
||||||
return out
|
return out
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user