Entropy/SocketHostInterface:

- reduce the forked requests timeout to 15 (from 300) seconds
- export the setting to etpConst


git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@2636 cd1c1023-2f26-0410-ae45-c471fc1f0318
This commit is contained in:
lxnay
2008-11-03 22:48:43 +00:00
parent 965fbb2e83
commit 6fc7c949ea
2 changed files with 9 additions and 1 deletions

View File

@@ -13699,6 +13699,13 @@ class SocketHostInterface:
if passed_away:
break
if dead or (seconds > my_timeout):
self.server.processor.HostInterface.updateProgress(
'interrupted: forked request timeout: %s,%s from client: %s' % (
seconds,
dead,
self.client_address,
)
)
if not dead:
import signal
os.kill(pid,signal.SIGKILL)
@@ -14664,7 +14671,7 @@ class SocketHostInterface:
# settings
self.SessionsLock = self.threading.Lock()
self.fork_requests = True # used by the command processor
self.fork_request_timeout_seconds = 300
self.fork_request_timeout_seconds = etpConst['socket_service']['forked_requests_timeout']
self.stdout_logging = True
self.timeout = etpConst['socket_service']['timeout']
self.hostname = etpConst['socket_service']['hostname']

View File

@@ -798,6 +798,7 @@ def const_defaultSettings(rootdir):
'port': 1026,
'ssl_port': 1027, # above + 1
'timeout': 200,
'forked_requests_timeout': 10,
'threads': 5,
'session_ttl': 15,
'default_uid': 0,