Commit 9c0f745e authored by Gary Poster's avatar Gary Poster

merge from buildout trunk

parents 0e70f73c 4c912de9
...@@ -32,6 +32,7 @@ import pkg_resources ...@@ -32,6 +32,7 @@ import pkg_resources
import re import re
import shutil import shutil
import sys import sys
import socket
import tempfile import tempfile
import UserDict import UserDict
import zc.buildout import zc.buildout
...@@ -133,6 +134,17 @@ _buildout_default_options = _annotate_section({ ...@@ -133,6 +134,17 @@ _buildout_default_options = _annotate_section({
'use-dependency-links': 'true', 'use-dependency-links': 'true',
}, 'DEFAULT_VALUE') }, 'DEFAULT_VALUE')
DEFAULT_SOCKET_TIMEOUT = socket.getdefaulttimeout()
def _setup_socket_timeout(timeout_string):
try:
timeout = int(timeout_string)
except ValueError:
_error("Timeout value must be numeric [%s]." % timeout_string)
current_timeout = socket.getdefaulttimeout()
if current_timeout <> timeout:
socket.setdefaulttimeout(timeout)
class Buildout(UserDict.DictMixin): class Buildout(UserDict.DictMixin):
...@@ -261,7 +273,7 @@ class Buildout(UserDict.DictMixin): ...@@ -261,7 +273,7 @@ class Buildout(UserDict.DictMixin):
options['installed']) options['installed'])
self._setup_logging() self._setup_logging()
self._setup_socket_timeout() self._display_socket_timeout()
offline = options['offline'] offline = options['offline']
if offline not in ('true', 'false'): if offline not in ('true', 'false'):
...@@ -787,18 +799,11 @@ class Buildout(UserDict.DictMixin): ...@@ -787,18 +799,11 @@ class Buildout(UserDict.DictMixin):
def _error(self, message, *args): def _error(self, message, *args):
raise zc.buildout.UserError(message % args) raise zc.buildout.UserError(message % args)
def _setup_socket_timeout(self): def _display_socket_timeout(self):
timeout = self['buildout']['socket-timeout'] current_timeout = socket.getdefaulttimeout()
if timeout <> '': if current_timeout <> DEFAULT_SOCKET_TIMEOUT:
try: info_msg = 'Socket timeout is set to %d seconds.' % current_timeout
timeout = int(timeout) self._logger.info(info_msg)
import socket
self._logger.info('Setting socket time out to %d seconds.', timeout)
socket.setdefaulttimeout(timeout)
except ValueError:
self._logger.warning("Default socket timeout is used !\n"
"Value in configuration is not numeric: [%s].\n",
timeout)
def _setup_logging(self): def _setup_logging(self):
root_logger = logging.getLogger() root_logger = logging.getLogger()
...@@ -1377,13 +1382,18 @@ def _open(base, filename, seen, dl_options, override): ...@@ -1377,13 +1382,18 @@ def _open(base, filename, seen, dl_options, override):
os.remove(path) os.remove(path)
extends = extended_by = None extends = extended_by = None
socket_timeout = None
for section in parser.sections(): for section in parser.sections():
options = dict(parser.items(section)) options = dict(parser.items(section))
if section == 'buildout': if section == 'buildout':
extends = options.pop('extends', extends) extends = options.pop('extends', extends)
extended_by = options.pop('extended-by', extended_by) extended_by = options.pop('extended-by', extended_by)
socket_timeout = options.pop('socket-timeout', socket_timeout)
result[section] = options result[section] = options
if socket_timeout is not None:
_setup_socket_timeout(socket_timeout)
result = _annotate(result, filename) result = _annotate(result, filename)
if root_config_file and 'buildout' in result: if root_config_file and 'buildout' in result:
...@@ -1677,12 +1687,10 @@ def main(args=None): ...@@ -1677,12 +1687,10 @@ def main(args=None):
elif op_ == 't': elif op_ == 't':
try: try:
timeout_string = args.pop(0) timeout_string = args.pop(0)
timeout = int(timeout_string) _setup_socket_timeout(timeout_string)
options.append(('buildout', 'socket-timeout', timeout_string)) options.append(('buildout', 'socket-timeout', timeout_string))
except IndexError: except IndexError:
_error("No timeout value specified for option", orig_op) _error("No timeout value specified for option t", orig_op)
except ValueError:
_error("Timeout value must be numeric", orig_op)
elif op: elif op:
if orig_op == '--help': if orig_op == '--help':
_help() _help()
......
...@@ -1535,15 +1535,14 @@ configured in the buildout section. Its value is configured in seconds. ...@@ -1535,15 +1535,14 @@ configured in the buildout section. Its value is configured in seconds.
... """) ... """)
>>> print system(buildout), >>> print system(buildout),
Setting socket time out to 5 seconds. Socket timeout is set to 5 seconds.
Develop: '/sample-buildout/recipes' Develop: '/sample-buildout/recipes'
Uninstalling debug. Uninstalling debug.
Installing debug. Installing debug.
op timeout op timeout
recipe recipes:debug recipe recipes:debug
If the socket-timeout is not numeric, a warning is issued and the default If socket-timeout is not numeric, an error message is issued.
timeout of the Python socket module is used.
>>> write(sample_buildout, 'buildout.cfg', >>> write(sample_buildout, 'buildout.cfg',
... """ ... """
...@@ -1558,13 +1557,7 @@ timeout of the Python socket module is used. ...@@ -1558,13 +1557,7 @@ timeout of the Python socket module is used.
... """) ... """)
>>> print system(buildout), >>> print system(buildout),
Default socket timeout is used ! Error: Timeout value must be numeric [5s].
Value in configuration is not numeric: [5s].
<BLANKLINE>
Develop: '/sample-buildout/recipes'
Updating debug.
op timeout
recipe recipes:debug
Uninstall recipes Uninstall recipes
----------------- -----------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment