Skip to content

Commit 3a43b92

Browse files
committed
Formatting
1 parent 910232a commit 3a43b92

File tree

4 files changed

+36
-14
lines changed

4 files changed

+36
-14
lines changed

src/tools/bin/arp_map.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,26 @@
1313
class ArpMapRecord(object):
1414
seen_names: dict = {}
1515

16-
def __init__(self, fqdn: str = None, ip: str = None, mac: str = None, interface: str = None, known_hosts_styler: callable = None, duplicate_hosts_styler: callable = None):
16+
def __init__(
17+
self,
18+
fqdn: str = None,
19+
ip: str = None,
20+
mac: str = None,
21+
interface: str = None,
22+
known_hosts_styler: callable = None,
23+
duplicate_hosts_styler: callable = None,
24+
):
1725
self.fqdn = fqdn
1826
self.ip = ip
1927
self.mac = mac
2028
self.interface = interface
2129
self.name = self.fqdn if self.fqdn != "?" else self.ip
22-
self.known_hosts_styler = known_hosts_styler if known_hosts_styler is not None else lambda x: click.style(x, 'green')
23-
self.duplicate_hosts_styler = duplicate_hosts_styler if duplicate_hosts_styler is not None else lambda x: click.style(x, 'red')
30+
self.known_hosts_styler = (
31+
known_hosts_styler if known_hosts_styler is not None else lambda x: click.style(x, 'green')
32+
)
33+
self.duplicate_hosts_styler = (
34+
duplicate_hosts_styler if duplicate_hosts_styler is not None else lambda x: click.style(x, 'red')
35+
)
2436
if self.name in ArpMapRecord.seen_names:
2537
ArpMapRecord.seen_names[self.name] = self.duplicate_hosts_styler(self.name)
2638
else:
@@ -103,7 +115,7 @@ def __iter__(self) -> typing.Iterable[ArpMapRecord]:
103115
yield record
104116

105117

106-
def add_record_to_list(record: ArpMapRecord, records_list: list) -> None:
118+
def add_record_to_list(record: ArpMapRecord, records_list: list) -> None:
107119
if record.fqdn.split('.')[0].lower() in KNOWN_HOSTS:
108120
records_list.insert(0, record)
109121
else:

src/tools/bin/backup_mysql.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
class GzipStream(object):
1313
# input is a filelike object that feeds the input
14-
def __init__(self, input, filename = None):
14+
def __init__(self, input, filename=None):
1515
self.input = input
1616
self.buffer = b''
17-
self.zipper = GzipFile(filename, mode = 'wb', fileobj = self)
17+
self.zipper = GzipFile(filename, mode='wb', fileobj=self)
1818

1919
def read(self, size=-1):
2020
if (size < 0) or len(self.buffer) < size:
@@ -43,7 +43,9 @@ def close(self):
4343

4444

4545
def parse_args(argv=sys.argv[1:]):
46-
parser = argparse.ArgumentParser(description='Backup all mysql DBs', formatter_class=argparse.ArgumentDefaultsHelpFormatter)
46+
parser = argparse.ArgumentParser(
47+
description='Backup all mysql DBs', formatter_class=argparse.ArgumentDefaultsHelpFormatter
48+
)
4749
parser.add_argument('--output-file', default='/mnt/opt/backup/mysql/{}_all_dump.sql.gz'.format(os.uname().nodename))
4850
parser.add_argument('--mysql-socket', default='/var/run/mysqld/mysqld.sock')
4951
parser.add_argument('--debug', default='INFO', choices=('INFO', 'DEBUG', 'WARN', 'ERROR'))
@@ -69,7 +71,7 @@ def new_size(self) -> int:
6971
self._new_size = os.stat(self.new_file).st_size
7072
return self._new_size
7173

72-
def size_difference_percent(self)-> float:
74+
def size_difference_percent(self) -> float:
7375
return (self.new_size - self.old_size) / self.old_size
7476

7577

@@ -79,7 +81,9 @@ def main(argv: list = sys.argv[1:]):
7981
_log.addHandler(logging.StreamHandler(sys.stdout))
8082
_log.setLevel(cfg.debug)
8183

82-
_output = tempfile.NamedTemporaryFile(delete=False, dir=os.path.dirname(cfg.output_file), prefix=os.path.basename(cfg.output_file))
84+
_output = tempfile.NamedTemporaryFile(
85+
delete=False, dir=os.path.dirname(cfg.output_file), prefix=os.path.basename(cfg.output_file)
86+
)
8387
_log.info('Running mysqldump')
8488
command = subprocess.Popen(['mysqldump', '-A', '-S', cfg.mysql_socket], stdout=subprocess.PIPE)
8589
gzipstream = GzipStream(command.stdout)

src/tools/bin/compare_ka.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,18 @@
99

1010

1111
@click.command()
12-
@click.argument("hostnames", nargs=-1) #, type=set)
12+
@click.argument("hostnames", nargs=-1) # , type=set)
1313
def main(hostnames: set):
1414
hc = HostChecker(hostnames)
1515
for host in hosts_if_not_me([h.name for h in hc.hosts]):
1616
click.echo(f"Checking {host}...")
17-
click.echo(check_output(["remote_diff.sh", "/etc/keepalived/keepalived.d/", f"{host.hostname}:/etc/keepalived/keepalived.d/"], universal_newlines=True, stderr=STDOUT))
17+
click.echo(
18+
check_output(
19+
["remote_diff.sh", "/etc/keepalived/keepalived.d/", f"{host.hostname}:/etc/keepalived/keepalived.d/"],
20+
universal_newlines=True,
21+
stderr=STDOUT,
22+
)
23+
)
1824

1925

2026
if __name__ == "__main__":

src/tools/bin/openvpn_log.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ def main(argv: list = sys.argv[1:]) -> int:
2121
with open(log_file, 'r') as f:
2222
lines = f.readlines()
2323
for line in lines:
24-
uniques[tuple(
25-
re.sub(r':[0-9]+', ':<port>', w) for w in line.split()[5:] if not re.search(skip_regexp, line)
26-
)] = line
24+
uniques[
25+
tuple(re.sub(r':[0-9]+', ':<port>', w) for w in line.split()[5:] if not re.search(skip_regexp, line))
26+
] = line
2727
print(''.join(sorted(uniques.values())))
2828
return skipped
2929

0 commit comments

Comments
 (0)