Revision 13998ef2 lib/utils.py
b/lib/utils.py | ||
---|---|---|
63 | 63 |
#: when set to True, L{RunCmd} is disabled |
64 | 64 |
no_fork = False |
65 | 65 |
|
66 |
_RANDOM_UUID_FILE = "/proc/sys/kernel/random/uuid" |
|
67 |
|
|
66 | 68 |
|
67 | 69 |
class RunResult(object): |
68 | 70 |
"""Holds the result of running external programs. |
... | ... | |
472 | 474 |
|
473 | 475 |
""" |
474 | 476 |
try: |
475 |
pf = open(pidfile, 'r')
|
|
477 |
raw_data = ReadFile(pidfile)
|
|
476 | 478 |
except EnvironmentError, err: |
477 | 479 |
if err.errno != errno.ENOENT: |
478 |
logging.exception("Can't read pid file?!")
|
|
480 |
logging.exception("Can't read pid file") |
|
479 | 481 |
return 0 |
480 | 482 |
|
481 | 483 |
try: |
482 |
pid = int(pf.read())
|
|
484 |
pid = int(raw_data)
|
|
483 | 485 |
except ValueError, err: |
484 | 486 |
logging.info("Can't parse pid file contents", exc_info=True) |
485 | 487 |
return 0 |
... | ... | |
1150 | 1152 |
@rtype: str |
1151 | 1153 |
|
1152 | 1154 |
""" |
1153 |
f = open("/proc/sys/kernel/random/uuid", "r") |
|
1154 |
try: |
|
1155 |
return f.read(128).rstrip("\n") |
|
1156 |
finally: |
|
1157 |
f.close() |
|
1155 |
return ReadFile(_RANDOM_UUID_FILE, size=128).rstrip("\n") |
|
1158 | 1156 |
|
1159 | 1157 |
|
1160 | 1158 |
def GenerateSecret(numbytes=20): |
Also available in: Unified diff