diff options
author | Nigel Babu <nigelb@redhat.com> | 2018-09-14 19:06:41 +0530 |
---|---|---|
committer | Amar Tumballi <amarts@redhat.com> | 2018-09-24 03:43:39 +0000 |
commit | 8297b909ab88e5ddb591cfb5aff0f06d14bd90cc (patch) | |
tree | 8df373b89954c72cd560da56f7b643b8bbf6b20b /extras/snap_scheduler/gcron.py | |
parent | b7732b9c069179aaa71a3463400fa438d1769f6c (diff) | |
download | glusterfs-8297b909ab88e5ddb591cfb5aff0f06d14bd90cc.tar.gz glusterfs-8297b909ab88e5ddb591cfb5aff0f06d14bd90cc.tar.xz glusterfs-8297b909ab88e5ddb591cfb5aff0f06d14bd90cc.zip |
python3: Fix python3 compatibility
Updates: #411
Change-Id: I7c1eaa92cd4ac05c3667b760e0db2cddcfbbaed8
Signed-off-by: Nigel Babu <nigelb@redhat.com>
Diffstat (limited to 'extras/snap_scheduler/gcron.py')
-rwxr-xr-x | extras/snap_scheduler/gcron.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/extras/snap_scheduler/gcron.py b/extras/snap_scheduler/gcron.py index 1c8569dcd8..1127be0e97 100755 --- a/extras/snap_scheduler/gcron.py +++ b/extras/snap_scheduler/gcron.py @@ -105,11 +105,11 @@ def doJob(name, lockFile, jobFunc, volname): else: log.info("Job %s has been processed already", name) fcntl.flock(f, fcntl.LOCK_UN) - except (OSError, IOError) as (errno, strerror): + except (OSError, IOError): log.info("Job %s is being processed by another agent", name) os.close(f) - except (OSError, IOError) as (errno, strerror): - log.debug("Failed to open lock file %s : %s", lockFile, strerror) + except (OSError, IOError) as e: + log.debug("Failed to open lock file %s : %s", lockFile, e) log.error("Failed to process job %s", name) success = False @@ -130,12 +130,12 @@ def main(): f = os.open(GCRON_RELOAD_FLAG, os.O_CREAT | os.O_NONBLOCK, 0o644) os.close(f) - except OSError as (errno, strerror): + except OSError as e: if errno != EEXIST: log.error("Failed to create %s : %s", - GCRON_RELOAD_FLAG, strerror) + GCRON_RELOAD_FLAG, e) output("Failed to create %s. Error: %s" - % (GCRON_RELOAD_FLAG, strerror)) + % (GCRON_RELOAD_FLAG, e)) return if not os.path.exists(GCRON_CROND_TASK): @@ -154,9 +154,9 @@ def main(): if process.returncode != 0: log.error("Failed to touch %s. Error: %s.", GCRON_CROND_TASK, err) - except (IOError, OSError) as (errno, strerror): + except (IOError, OSError) as e: log.error("Failed to touch %s. Error: %s.", - GCRON_CROND_TASK, strerror) + GCRON_CROND_TASK, e) return if os.lstat(GCRON_TASKS).st_mtime > \ os.lstat(GCRON_CROND_TASK).st_mtime: @@ -168,9 +168,9 @@ def main(): if process.returncode != 0: log.error("Failed to touch %s. Error: %s.", GCRON_CROND_TASK, err) - except IOError as (errno, strerror): + except IOError as e: log.error("Failed to touch %s. Error: %s.", - GCRON_CROND_TASK, strerror) + GCRON_CROND_TASK, e) return volname = sys.argv[1] |