[sagenb] 85/179: increase timeout for live documents to 600s

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository sagenb.

commit 9a0b7a4fe8744d5046cc1eb6eaef755e30527837
Author: P Purkayastha <ppurka at gmail.com>
Date:   Tue Apr 2 15:57:23 2013 +0800

    increase timeout for live documents to 600s
---
 sagenb/notebook/notebook_object.py | 2 +-
 sagenb/notebook/server_conf.py     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sagenb/notebook/notebook_object.py b/sagenb/notebook/notebook_object.py
index 62fd6cd..bb8dcc7 100644
--- a/sagenb/notebook/notebook_object.py
+++ b/sagenb/notebook/notebook_object.py
@@ -102,7 +102,7 @@ class NotebookObject:
           timeout can be useful as this will free the memory used by
           idle sessions.
 
-        - ``doc_timeout`` -- integer (default: 120) seconds until idle
+        - ``doc_timeout`` -- integer (default: 600) seconds until idle
           live documentation worksheet sessions automatically timeout,
           i.e., the corresponding Sage session terminates.
           0 means "never timeout".
diff --git a/sagenb/notebook/server_conf.py b/sagenb/notebook/server_conf.py
index 707cafe..59615fc 100644
--- a/sagenb/notebook/server_conf.py
+++ b/sagenb/notebook/server_conf.py
@@ -14,8 +14,8 @@ _ = lazy_gettext
 defaults = {'word_wrap_cols':72,
             'max_history_length':250,
 
-            'idle_timeout': 120,
-            'doc_timeout': 120,
+            'idle_timeout': 120,        # timeout in seconds for worksheets
+            'doc_timeout': 600,         # timeout in seconds for live docs
             'idle_check_interval':360,
 
             'save_interval':360,        # seconds

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git