Revision f47417e7 kamaki/clients/__init__.py

b/kamaki/clients/__init__.py
42 42

  
43 43
from objpool.http import PooledHTTPConnection
44 44

  
45
from kamaki.clients.utils import logger
45
from kamaki import logger
46 46

  
47
DEBUG_LOG = logger.get_log_filename()
47
LOG_FILE = logger.get_log_filename()
48 48
TIMEOUT = 60.0   # seconds
49 49
HTTP_METHODS = ['GET', 'POST', 'PUT', 'HEAD', 'DELETE', 'COPY', 'MOVE']
50 50

  
51
logger.add_file_logger('clients.send', __name__, filename=DEBUG_LOG)
51
logger.add_file_logger('clients.send', __name__, filename=LOG_FILE)
52 52
sendlog = logger.get_logger('clients.send')
53
sendlog.debug('Logging location: %s' % DEBUG_LOG)
53
sendlog.debug('Logging location: %s' % LOG_FILE)
54 54

  
55
logger.add_file_logger('data.send', __name__, filename=DEBUG_LOG)
55
logger.add_file_logger('data.send', __name__, filename=LOG_FILE)
56 56
datasendlog = logger.get_logger('data.send')
57 57

  
58
logger.add_file_logger('clients.recv', __name__, filename=DEBUG_LOG)
58
logger.add_file_logger('clients.recv', __name__, filename=LOG_FILE)
59 59
recvlog = logger.get_logger('clients.recv')
60 60

  
61
logger.add_file_logger('data.recv', __name__, filename=DEBUG_LOG)
61
logger.add_file_logger('data.recv', __name__, filename=LOG_FILE)
62 62
datarecvlog = logger.get_logger('data.recv')
63 63

  
64
logger.add_file_logger('ClientError', __name__, filename=DEBUG_LOG)
64
logger.add_file_logger('ClientError', __name__, filename=LOG_FILE)
65 65
clienterrorlog = logger.get_logger('ClientError')
66 66

  
67 67

  
......
186 186
            headers=self.headers,
187 187
            body=self.data)
188 188
        self.log()
189
        keep_trying = 60.0
189
        keep_trying = TIMEOUT
190 190
        while keep_trying > 0:
191 191
            try:
192 192
                return conn.getresponse()

Also available in: Unified diff