Revision b48909c8
b/lib/hypervisor/hv_xen.py | ||
---|---|---|
26 | 26 |
import os |
27 | 27 |
import os.path |
28 | 28 |
import time |
29 |
import logging |
|
29 | 30 |
from cStringIO import StringIO |
30 | 31 |
|
31 | 32 |
from ganeti import constants |
32 | 33 |
from ganeti import errors |
33 |
from ganeti import logger |
|
34 | 34 |
from ganeti import utils |
35 | 35 |
from ganeti.hypervisor import hv_base |
36 | 36 |
|
... | ... | |
71 | 71 |
result = utils.RunCmd(["xm", "list"]) |
72 | 72 |
if not result.failed: |
73 | 73 |
break |
74 |
logger.Error("xm list failed (%s): %s" % (result.fail_reason,
|
|
75 |
result.output))
|
|
74 |
logging.error("xm list failed (%s): %s", result.fail_reason,
|
|
75 |
result.output)
|
|
76 | 76 |
time.sleep(1) |
77 | 77 |
|
78 | 78 |
if result.failed: |
... | ... | |
184 | 184 |
# note: in xen 3, memory has changed to total_memory |
185 | 185 |
result = utils.RunCmd(["xm", "info"]) |
186 | 186 |
if result.failed: |
187 |
logger.Error("Can't run 'xm info': %s" % result.fail_reason) |
|
187 |
logging.error("Can't run 'xm info' (%s): %s", result.fail_reason, |
|
188 |
result.output) |
|
188 | 189 |
return None |
189 | 190 |
|
190 | 191 |
xmoutput = result.stdout.splitlines() |
Also available in: Unified diff