pretecno/docker-seafile-client
3
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Replace subprocess.run with subprocess.check_call to raise exceptions on errors

Browse Source
This commit is contained in:
flowgunso
2024-06-07 15:27:30 +02:00
parent eaa8a1edeb
commit 8e01d6758e
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
seafile-client/entrypoint-seafile.py
+11 -8
View File
@@ -133,14 +133,17 @@ class Client:
if not self.ini.exists(): if not self.ini.exists():
logger.info("Seafile .ini file not found, running `seaf-cli init`") logger.info("Seafile .ini file not found, running `seaf-cli init`")
#self.ini.parent.parent.mkdir(parents=True, exist_ok=True) #self.ini.parent.parent.mkdir(parents=True, exist_ok=True)
subprocess.run(self.binary + ["init", "-d", str(self.seafile)]) subprocess.check_call(self.binary + ["init", "-d", str(self.seafile)])
while not self.ini.exists(): while not self.ini.exists():
logging.debug("Waiting for the .ini file to be created...") logging.debug("Waiting for the .ini file to be created...")
time.sleep(1) time.sleep(1)
# Start the Seafile client. # Start the Seafile client.
logger.info("Starting `seaf-cli`.") logger.info("Starting `seaf-cli`.")
subprocess.run(self.binary + ["start"]) try:
subprocess.check_call(self.binary + ["start"])
except Exception as e:
raise e
while not self.socket.exists(): while not self.socket.exists():
logger.debug("Waiting for the Seafile client socket to be created.") logger.debug("Waiting for the Seafile client socket to be created.")
time.sleep(1) time.sleep(1)
@@ -150,11 +153,11 @@ class Client:
def configure(self): def configure(self):
command = self.binary + ["config"] command = self.binary + ["config"]
if self.skip_ssl_cert: if self.skip_ssl_cert:
subprocess.run(command +["-k", "disable_verify_certificate", "-v", self.skip_ssl_cert]) subprocess.check_call(command +["-k", "disable_verify_certificate", "-v", self.skip_ssl_cert])
if self.download_limit: if self.download_limit:
subprocess.run(command +["-k", "download_limit", "-v", self.download_limit]) subprocess.check_call(command +["-k", "download_limit", "-v", self.download_limit])
if self.upload_limit: if self.upload_limit:
subprocess.run(command +["-k", "upload_limit", "-v", self.upload_limit]) subprocess.check_call(command +["-k", "upload_limit", "-v", self.upload_limit])
def synchronize(self): def synchronize(self):
core = self.binary + ["sync", "-u", self.username, "-p", self.password, "-s", self.url] core = self.binary + ["sync", "-u", self.username, "-p", self.password, "-s", self.url]
@@ -178,18 +181,18 @@ class Client:
command += ["-d", str(target)] command += ["-d", str(target)]
if self.mfa_secret: if self.mfa_secret:
totp = subprocess.run( totp = subprocess.check_call(
f"oathtool --base32 --totp {self.mfa_secret}", f"oathtool --base32 --totp {self.mfa_secret}",
text=True, text=True,
capture_stdout=True).stdout capture_stdout=True).stdout
command += ["-a", totp] command += ["-a", totp]
logging.debug(f"Running {' '.join(command)}") logging.debug(f"Running {' '.join(command)}")
subprocess.run(command) subprocess.check_call(command)
def follow(self): def follow(self):
logging.debug(f"Running `tail -v -f {self.log}`") logging.debug(f"Running `tail -v -f {self.log}`")
subprocess.run(["tail", "-v", "-f", self.log]) subprocess.check_call(["tail", "-v", "-f", self.log])
def healthcheck(self): def healthcheck(self):