git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
expects the 'interfaces' key in GetSlivers - review logs to always mention module
[nodemanager.git]
/
tools.py
diff --git
a/tools.py
b/tools.py
index
122b321
..
267ec31
100644
(file)
--- a/
tools.py
+++ b/
tools.py
@@
-1,3
+1,6
@@
+# $Id$
+# $URL$
+
"""A few things that didn't seem to fit anywhere else."""
import cPickle
"""A few things that didn't seem to fit anywhere else."""
import cPickle
@@
-78,7
+81,7
@@
def fork_as(su, function, *args):
except:
os.seteuid(os.getuid()) # undo su so we can write the log file
os.setegid(os.getgid())
except:
os.seteuid(os.getuid()) # undo su so we can write the log file
os.setegid(os.getgid())
- logger.log_exc()
+ logger.log_exc(
"tools: fork_as"
)
os._exit(0)
else: os.waitpid(child_pid, 0)
os._exit(0)
else: os.waitpid(child_pid, 0)
@@
-125,18
+128,6
@@
def node_id():
_node_id=""
return _node_id
_node_id=""
return _node_id
-# get slicefamily from /etc/planetlab/slicefamily and cache it
-# http://svn.planet-lab.org/wiki/SliceFamily
-_slicefamily=None
-def slicefamily():
- global _slicefamily
- if _slicefamily is None:
- try:
- _slicefamily=file("/etc/planetlab/slicefamily").read().strip()
- except:
- _slicefamily=""
- return _slicefamily
-
_root_context_arch=None
def root_context_arch():
global _root_context_arch
_root_context_arch=None
def root_context_arch():
global _root_context_arch
@@
-147,7
+138,7
@@
def root_context_arch():
class NMLock:
def __init__(self, file):
class NMLock:
def __init__(self, file):
- logger.log("Lock %s initialized." % file, 2)
+ logger.log("
tools:
Lock %s initialized." % file, 2)
self.fd = os.open(file, os.O_RDWR|os.O_CREAT, 0600)
flags = fcntl.fcntl(self.fd, fcntl.F_GETFD)
flags |= fcntl.FD_CLOEXEC
self.fd = os.open(file, os.O_RDWR|os.O_CREAT, 0600)
flags = fcntl.fcntl(self.fd, fcntl.F_GETFD)
flags |= fcntl.FD_CLOEXEC
@@
-155,8
+146,8
@@
class NMLock:
def __del__(self):
os.close(self.fd)
def acquire(self):
def __del__(self):
os.close(self.fd)
def acquire(self):
- logger.log("Lock acquired.", 2)
+ logger.log("
tools:
Lock acquired.", 2)
fcntl.lockf(self.fd, fcntl.LOCK_SH)
def release(self):
fcntl.lockf(self.fd, fcntl.LOCK_SH)
def release(self):
- logger.log("Lock released.", 2)
+ logger.log("
tools:
Lock released.", 2)
fcntl.lockf(self.fd, fcntl.LOCK_UN)
fcntl.lockf(self.fd, fcntl.LOCK_UN)