snegov/cura-te-ipsum
1
0
Fork 0
Code Issues 29 Releases Wiki Activity

Create per-module loggers

Browse Source
This commit is contained in:
Maks Snegov 2021-05-28 00:40:54 +03:00
parent d67550cb38
commit ce32dd7317
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -105,3 +105,5 @@ venv.bak/
# pycharm # pycharm
.idea/ .idea/
tmp/

8
main.py
View File

@ -2,10 +2,11 @@
import argparse import argparse
import logging import logging
import os.path
import pathlib import pathlib
import sys import sys
import fs _lg = logging.getLogger('spqr.curateipsum')
def main(): def main():
@ -30,7 +31,10 @@ def main():
loglevel = logging.DEBUG if args.verbose else logging.INFO loglevel = logging.DEBUG if args.verbose else logging.INFO
logging.basicConfig(level=loglevel, handlers=[console_handler]) logging.basicConfig(level=loglevel, handlers=[console_handler])
logging.info(args.src_dirs) backup_dir_abs = os.path.abspath(args.backup_dir)
if not os.path.isdir(backup_dir_abs):
_lg.error("Backup directory %s does not exist, exiting", args.backup_dir)
return 1
# fs.hardlink_dir(sys.argv[1], sys.argv[2]) # fs.hardlink_dir(sys.argv[1], sys.argv[2])
# fs.rsync(sys.argv[1], sys.argv[2]) # fs.rsync(sys.argv[1], sys.argv[2])

16
fs.py → spqr/curateipsum/fs.py
View File

@ -3,6 +3,8 @@ import os
import subprocess import subprocess
from typing import Iterable from typing import Iterable
_lg = logging.getLogger(__name__)
def rsync_ext(src, dst, dry_run=False): def rsync_ext(src, dst, dry_run=False):
"""Call external rsync command""" """Call external rsync command"""
@ -40,7 +42,7 @@ def rsync(src_dir, dst_dir=None):
:return: nothing :return: nothing
""" """
logging.info(f"Rsync: {src_dir} -> {dst_dir}") _lg.info(f"Rsync: {src_dir} -> {dst_dir}")
src_abs = os.path.abspath(src_dir) src_abs = os.path.abspath(src_dir)
dst_abs = os.path.abspath(dst_dir) dst_abs = os.path.abspath(dst_dir)
@ -67,7 +69,7 @@ def rsync(src_dir, dst_dir=None):
do_update = True do_update = True
if do_update: if do_update:
logging.info("Updating %s", src_entry) _lg.info("Updating %s", src_entry)
def hardlink_dir(src_dir, dst_dir): def hardlink_dir(src_dir, dst_dir):
@ -77,12 +79,12 @@ def hardlink_dir(src_dir, dst_dir):
:param dst_dir: path to target directory :param dst_dir: path to target directory
:return: None :return: None
""" """
logging.info(f"Recursive hardlinking: {src_dir} -> {dst_dir}") _lg.info(f"Recursive hardlinking: {src_dir} -> {dst_dir}")
src_abs = os.path.abspath(src_dir) src_abs = os.path.abspath(src_dir)
dst_abs = os.path.abspath(dst_dir) dst_abs = os.path.abspath(dst_dir)
def recursive_hardlink(src, dst): def recursive_hardlink(src, dst):
logging.debug(f"Creating directory: {src} -> {dst}") _lg.debug(f"Creating directory: {src} -> {dst}")
os.mkdir(dst) os.mkdir(dst)
with os.scandir(src) as it: with os.scandir(src) as it:
@ -93,18 +95,18 @@ def hardlink_dir(src_dir, dst_dir):
recursive_hardlink(ent.path, ent_dst_path) recursive_hardlink(ent.path, ent_dst_path)
continue continue
if ent.is_file(follow_symlinks=False) or ent.is_symlink(): if ent.is_file(follow_symlinks=False) or ent.is_symlink():
logging.debug(f"Hardlink file: {ent.path} -> {ent_dst_path}") _lg.debug(f"Hardlink file: {ent.path} -> {ent_dst_path}")
os.link(ent.path, ent_dst_path, follow_symlinks=False) os.link(ent.path, ent_dst_path, follow_symlinks=False)
continue continue
# something that is not a file, symlink or directory # something that is not a file, symlink or directory
raise NotImplementedError(ent.path) raise NotImplementedError(ent.path)
if not os.path.isdir(src_abs): if not os.path.isdir(src_abs):
logging.error(f"Error reading source directory: {src_dir}") _lg.error(f"Error reading source directory: {src_dir}")
raise RuntimeError(f"Error reading source directory: {src_dir}") raise RuntimeError(f"Error reading source directory: {src_dir}")
if os.path.exists(dst_abs): if os.path.exists(dst_abs):
logging.error(f"Destination already exists: {dst_dir}") _lg.error(f"Destination already exists: {dst_dir}")
raise RuntimeError(f"Destination already exists: {dst_dir}") raise RuntimeError(f"Destination already exists: {dst_dir}")
recursive_hardlink(src_abs, dst_abs) recursive_hardlink(src_abs, dst_abs)