diff options
author | Jonathan de Jong <jonathan@automatia.nl> | 2021-07-19 16:28:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-19 15:28:05 +0100 |
commit | 95e47b2e782b5e7afa5fd2afd1d0ea7745eaac36 (patch) | |
tree | 790fadd03146a98be794c3d26b34224241a26271 /synapse/util/daemonize.py | |
parent | Remove unused `events_by_room` (#10421) (diff) | |
download | synapse-95e47b2e782b5e7afa5fd2afd1d0ea7745eaac36.tar.xz |
[pyupgrade] `synapse/` (#10348)
This PR is tantamount to running ``` pyupgrade --py36-plus --keep-percent-format `find synapse/ -type f -name "*.py"` ``` Part of #9744
Diffstat (limited to 'synapse/util/daemonize.py')
-rw-r--r-- | synapse/util/daemonize.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/util/daemonize.py b/synapse/util/daemonize.py index 31b24dd188..d8532411c2 100644 --- a/synapse/util/daemonize.py +++ b/synapse/util/daemonize.py @@ -31,13 +31,13 @@ def daemonize_process(pid_file: str, logger: logging.Logger, chdir: str = "/") - # If pidfile already exists, we should read pid from there; to overwrite it, if # locking will fail, because locking attempt somehow purges the file contents. if os.path.isfile(pid_file): - with open(pid_file, "r") as pid_fh: + with open(pid_file) as pid_fh: old_pid = pid_fh.read() # Create a lockfile so that only one instance of this daemon is running at any time. try: lock_fh = open(pid_file, "w") - except IOError: + except OSError: print("Unable to create the pidfile.") sys.exit(1) @@ -45,7 +45,7 @@ def daemonize_process(pid_file: str, logger: logging.Logger, chdir: str = "/") - # Try to get an exclusive lock on the file. This will fail if another process # has the file locked. fcntl.flock(lock_fh, fcntl.LOCK_EX | fcntl.LOCK_NB) - except IOError: + except OSError: print("Unable to lock on the pidfile.") # We need to overwrite the pidfile if we got here. # @@ -113,7 +113,7 @@ def daemonize_process(pid_file: str, logger: logging.Logger, chdir: str = "/") - try: lock_fh.write("%s" % (os.getpid())) lock_fh.flush() - except IOError: + except OSError: logger.error("Unable to write pid to the pidfile.") print("Unable to write pid to the pidfile.") sys.exit(1) |