projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-ofctl: Clarify in_port in manpage.
[openvswitch]
/
python
/
ovs
/
daemon.py
diff --git
a/python/ovs/daemon.py
b/python/ovs/daemon.py
index a14be820a62838518f836d4dab5a11d1f099c236..184e7832fc264f8d0bf52dd2df8d56d7c5695a2b 100644
(file)
--- a/
python/ovs/daemon.py
+++ b/
python/ovs/daemon.py
@@
-141,23
+141,23
@@
def _make_pidfile():
# unlock the lock for us, and we don't want that.
global file
# unlock the lock for us, and we don't want that.
global file
- file = open(tmpfile, "w")
+ file
_handle
= open(tmpfile, "w")
except IOError, e:
_fatal("%s: create failed (%s)" % (tmpfile, e.strerror))
try:
except IOError, e:
_fatal("%s: create failed (%s)" % (tmpfile, e.strerror))
try:
- s = os.fstat(file.fileno())
+ s = os.fstat(file
_handle
.fileno())
except IOError, e:
_fatal("%s: fstat failed (%s)" % (tmpfile, e.strerror))
try:
except IOError, e:
_fatal("%s: fstat failed (%s)" % (tmpfile, e.strerror))
try:
- file.write("%s\n" % pid)
- file.flush()
+ file
_handle
.write("%s\n" % pid)
+ file
_handle
.flush()
except OSError, e:
_fatal("%s: write failed: %s" % (tmpfile, e.strerror))
try:
except OSError, e:
_fatal("%s: write failed: %s" % (tmpfile, e.strerror))
try:
- fcntl.lockf(file, fcntl.LOCK_EX | fcntl.LOCK_NB)
+ fcntl.lockf(file
_handle
, fcntl.LOCK_EX | fcntl.LOCK_NB)
except IOError, e:
_fatal("%s: fcntl failed: %s" % (tmpfile, e.strerror))
except IOError, e:
_fatal("%s: fcntl failed: %s" % (tmpfile, e.strerror))
@@
-407,7
+407,7
@@
def __read_pidfile(pidfile, delete_if_stale):
pass
try:
pass
try:
- file = open(pidfile, "r+")
+ file
_handle
= open(pidfile, "r+")
except IOError, e:
if e.errno == errno.ENOENT and delete_if_stale:
return 0
except IOError, e:
if e.errno == errno.ENOENT and delete_if_stale:
return 0
@@
-417,11
+417,11
@@
def __read_pidfile(pidfile, delete_if_stale):
# Python fcntl doesn't directly support F_GETLK so we have to just try
# to lock it.
try:
# Python fcntl doesn't directly support F_GETLK so we have to just try
# to lock it.
try:
- fcntl.lockf(file, fcntl.LOCK_EX | fcntl.LOCK_NB)
+ fcntl.lockf(file
_handle
, fcntl.LOCK_EX | fcntl.LOCK_NB)
# pidfile exists but wasn't locked by anyone. Now we have the lock.
if not delete_if_stale:
# pidfile exists but wasn't locked by anyone. Now we have the lock.
if not delete_if_stale:
- file.close()
+ file
_handle
.close()
logging.warning("%s: pid file is stale" % pidfile)
return -errno.ESRCH
logging.warning("%s: pid file is stale" % pidfile)
return -errno.ESRCH
@@
-429,7
+429,7
@@
def __read_pidfile(pidfile, delete_if_stale):
try:
raced = False
s = os.stat(pidfile)
try:
raced = False
s = os.stat(pidfile)
- s2 = os.fstat(file.fileno())
+ s2 = os.fstat(file
_handle
.fileno())
if s.st_ino != s2.st_ino or s.st_dev != s2.st_dev:
raced = True
except IOError:
if s.st_ino != s2.st_ino or s.st_dev != s2.st_dev:
raced = True
except IOError:
@@
-447,7
+447,7
@@
def __read_pidfile(pidfile, delete_if_stale):
return -e.errno
else:
logging.debug("%s: deleted stale pidfile" % pidfile)
return -e.errno
else:
logging.debug("%s: deleted stale pidfile" % pidfile)
- file.close()
+ file
_handle
.close()
return 0
except IOError, e:
if e.errno not in [errno.EACCES, errno.EAGAIN]:
return 0
except IOError, e:
if e.errno not in [errno.EACCES, errno.EAGAIN]:
@@
-457,16
+457,18
@@
def __read_pidfile(pidfile, delete_if_stale):
# Someone else has the pidfile locked.
try:
try:
# Someone else has the pidfile locked.
try:
try:
-
return int(fi
le.readline())
+
error = int(file_hand
le.readline())
except IOError, e:
logging.warning("%s: read: %s" % (pidfile, e.strerror))
except IOError, e:
logging.warning("%s: read: %s" % (pidfile, e.strerror))
-
return
-e.errno
+
error =
-e.errno
except ValueError:
logging.warning("%s does not contain a pid" % pidfile)
except ValueError:
logging.warning("%s does not contain a pid" % pidfile)
- return -errno.EINVAL
+ error = -errno.EINVAL
+
+ return error
finally:
try:
finally:
try:
- file.close()
+ file
_handle
.close()
except IOError:
pass
except IOError:
pass