From 111b6ad56f11200e11db60c96845583102698302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mi=C5=82osz=20Stocki?= Date: Wed, 2 Oct 2019 11:49:08 +0200 Subject: [PATCH] PEP8 --- zfssmd.py | 8 ++++---- zfssmd_worker.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zfssmd.py b/zfssmd.py index a16c2e1..a071fea 100644 --- a/zfssmd.py +++ b/zfssmd.py @@ -5,7 +5,7 @@ from pathlib import Path import logging as log import signal import time -from zfssmd_worker import ZFSSM_Daemon_Refresh +from zfssmd_worker import ZFSSMDaemonRefresh ENCODING = 'utf-8' UNIX_SOCK=Path('/run/zfssmd.sock') @@ -21,7 +21,7 @@ class ZfsSnapshotManagerDaemon(object): @Pyro4.expose def call_zfs_list_snapshots(self): - command = ('zfs list -Hp -t snapshot -o name,creation,used,referenced -s name') + command = 'zfs list -Hp -t snapshot -o name,creation,used,referenced -s name' ## TODO try except this shit ## TODO log exec time of this command p = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) @@ -41,7 +41,7 @@ class ZfsSnapshotManagerDaemon(object): def check_start_conditions(): ## TODO test if already running PID ## FIXME For now we're just forcing start with deleting sock file first - if (UNIX_SOCK.is_socket() or UNIX_SOCK.is_file()): + if UNIX_SOCK.is_socket() or UNIX_SOCK.is_file(): try: UNIX_SOCK.unlink() except Exception as e: @@ -63,7 +63,7 @@ def start_daemon(): daemon = Pyro4.Daemon(port=None,unixsocket=str(UNIX_SOCK)) uri = daemon.register(ZfsSnapshotManagerDaemon(), CONN_ID) log.info(uri) - ZFSSM_Daemon_Refresh() + ZFSSMDaemonRefresh() daemon.requestLoop() start_daemon() \ No newline at end of file diff --git a/zfssmd_worker.py b/zfssmd_worker.py index dfa9df9..ee9608a 100644 --- a/zfssmd_worker.py +++ b/zfssmd_worker.py @@ -5,7 +5,7 @@ import logging as log DEFAULT_REFRESH_INTERVAL=(5 * 60) -class ZFSSM_Daemon_Refresh(object): +class ZFSSMDaemonRefresh(object): ## TODO Docstrings def __init__(self, interval=DEFAULT_REFRESH_INTERVAL): self.interval = interval