Revision 111a7d04
| b/lib/utils/__init__.py | ||
|---|---|---|
| 41 | 41 |
from ganeti import errors |
| 42 | 42 |
from ganeti import constants |
| 43 | 43 |
from ganeti import compat |
| 44 |
from ganeti import pathutils |
|
| 44 | 45 |
|
| 45 | 46 |
from ganeti.utils.algo import * |
| 46 | 47 |
from ganeti.utils.filelock import * |
| ... | ... | |
| 466 | 467 |
"""Check for and start daemon if not alive. |
| 467 | 468 |
|
| 468 | 469 |
""" |
| 469 |
result = RunCmd([constants.DAEMON_UTIL, "check-and-start", name])
|
|
| 470 |
result = RunCmd([pathutils.DAEMON_UTIL, "check-and-start", name])
|
|
| 470 | 471 |
if result.failed: |
| 471 | 472 |
logging.error("Can't start daemon '%s', failure %s, output: %s",
|
| 472 | 473 |
name, result.fail_reason, result.output) |
| ... | ... | |
| 479 | 480 |
"""Stop daemon |
| 480 | 481 |
|
| 481 | 482 |
""" |
| 482 |
result = RunCmd([constants.DAEMON_UTIL, "stop", name])
|
|
| 483 |
result = RunCmd([pathutils.DAEMON_UTIL, "stop", name])
|
|
| 483 | 484 |
if result.failed: |
| 484 | 485 |
logging.error("Can't stop daemon '%s', failure %s, output: %s",
|
| 485 | 486 |
name, result.fail_reason, result.output) |
| b/lib/utils/io.py | ||
|---|---|---|
| 32 | 32 |
|
| 33 | 33 |
from ganeti import errors |
| 34 | 34 |
from ganeti import constants |
| 35 |
from ganeti import pathutils |
|
| 35 | 36 |
from ganeti.utils import filelock |
| 36 | 37 |
|
| 37 | 38 |
|
| ... | ... | |
| 903 | 904 |
daemon name |
| 904 | 905 |
|
| 905 | 906 |
""" |
| 906 |
return PathJoin(constants.RUN_DIR, "%s.pid" % name)
|
|
| 907 |
return PathJoin(pathutils.RUN_DIR, "%s.pid" % name)
|
|
| 907 | 908 |
|
| 908 | 909 |
|
| 909 | 910 |
def WritePidFile(pidfile): |
Also available in: Unified diff