osiu97
/
ZFS_Snapshot_Manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PEP8

This commit is contained in:
Miłosz Stocki 2019-10-02 11:49:08 +02:00
parent b921a833dc
commit 111b6ad56f
Signed by: osiu97
GPG Key ID: E3D1D83FA04F51D6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zfssmd.py
View File

@ -5,7 +5,7 @@ from pathlib import Path
import logging as log import logging as log
import signal import signal
import time import time
from zfssmd_worker import ZFSSM_Daemon_Refresh from zfssmd_worker import ZFSSMDaemonRefresh
ENCODING = 'utf-8' ENCODING = 'utf-8'
UNIX_SOCK=Path('/run/zfssmd.sock') UNIX_SOCK=Path('/run/zfssmd.sock')
@ -21,7 +21,7 @@ class ZfsSnapshotManagerDaemon(object):
@Pyro4.expose @Pyro4.expose
def call_zfs_list_snapshots(self): 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 try except this shit
## TODO log exec time of this command ## TODO log exec time of this command
p = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) p = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
@ -41,7 +41,7 @@ class ZfsSnapshotManagerDaemon(object):
def check_start_conditions(): def check_start_conditions():
## TODO test if already running PID ## TODO test if already running PID
## FIXME For now we're just forcing start with deleting sock file first ## 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: try:
UNIX_SOCK.unlink() UNIX_SOCK.unlink()
except Exception as e: except Exception as e:
@ -63,7 +63,7 @@ def start_daemon():
daemon = Pyro4.Daemon(port=None,unixsocket=str(UNIX_SOCK)) daemon = Pyro4.Daemon(port=None,unixsocket=str(UNIX_SOCK))
uri = daemon.register(ZfsSnapshotManagerDaemon(), CONN_ID) uri = daemon.register(ZfsSnapshotManagerDaemon(), CONN_ID)
log.info(uri) log.info(uri)
ZFSSM_Daemon_Refresh() ZFSSMDaemonRefresh()
daemon.requestLoop() daemon.requestLoop()
start_daemon() start_daemon()

2
zfssmd_worker.py
View File

@ -5,7 +5,7 @@ import logging as log
DEFAULT_REFRESH_INTERVAL=(5 * 60) DEFAULT_REFRESH_INTERVAL=(5 * 60)
class ZFSSM_Daemon_Refresh(object): class ZFSSMDaemonRefresh(object):
## TODO Docstrings ## TODO Docstrings
def __init__(self, interval=DEFAULT_REFRESH_INTERVAL): def __init__(self, interval=DEFAULT_REFRESH_INTERVAL):
self.interval = interval self.interval = interval