Revision 58b311ca
b/lib/rpc.py | ||
---|---|---|
33 | 33 |
import os |
34 | 34 |
import socket |
35 | 35 |
import httplib |
36 |
import logging |
|
36 | 37 |
|
37 | 38 |
import simplejson |
38 | 39 |
|
39 |
from ganeti import logger |
|
40 | 40 |
from ganeti import utils |
41 | 41 |
from ganeti import objects |
42 | 42 |
|
... | ... | |
63 | 63 |
hc.endheaders() |
64 | 64 |
hc.send(parent.body) |
65 | 65 |
except socket.error, err: |
66 |
logger.Error("Error connecting to %s: %s" % (node, str(err)))
|
|
66 |
logging.exception("Error connecting to node %s", node)
|
|
67 | 67 |
self.failed = True |
68 | 68 |
|
69 | 69 |
def get_response(self): |
... | ... | |
81 | 81 |
except ValueError: |
82 | 82 |
return False |
83 | 83 |
if not length: |
84 |
logger.Error("Zero-length reply from %s" % self.node)
|
|
84 |
logging.error("Zero-length reply from node %s", self.node)
|
|
85 | 85 |
return False |
86 | 86 |
payload = resp.read(length) |
87 | 87 |
unload = simplejson.loads(payload) |
... | ... | |
393 | 393 |
for node_name in retux: |
394 | 394 |
ret = retux.get(node_name, False) |
395 | 395 |
if type(ret) != dict: |
396 |
logger.Error("could not connect to node %s" % (node_name))
|
|
396 |
logging.error("could not connect to node %s", node_name)
|
|
397 | 397 |
ret = {} |
398 | 398 |
|
399 | 399 |
utils.CheckDict(ret, |
Also available in: Unified diff