projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '9427-threaded-websockets' closes #9427
[arvados.git]
/
services
/
nodemanager
/
arvnodeman
/
config.py
diff --git
a/services/nodemanager/arvnodeman/config.py
b/services/nodemanager/arvnodeman/config.py
index 15891a92bcf8a7fdd5365595489e5efe96a5e0cd..b54461c47d81b9f87bc1096da254cdf60e3f8aa9 100644
(file)
--- a/
services/nodemanager/arvnodeman/config.py
+++ b/
services/nodemanager/arvnodeman/config.py
@@
-44,7
+44,8
@@
class NodeManagerConfig(ConfigParser.SafeConfigParser):
'poll_stale_after': '600',
'max_total_price': '0',
'boot_fail_after': str(sys.maxint),
'poll_stale_after': '600',
'max_total_price': '0',
'boot_fail_after': str(sys.maxint),
- 'node_stale_after': str(60 * 60 * 2)},
+ 'node_stale_after': str(60 * 60 * 2),
+ 'watchdog': '600'},
'Logging': {'file': '/dev/stderr',
'level': 'WARNING'},
}.iteritems():
'Logging': {'file': '/dev/stderr',
'level': 'WARNING'},
}.iteritems():