Don't create the gradebook database until formgrader is accessed

jupyter · May 30, 2017 · 71685ab · 71685ab
1 parent fe6bc0f
commit 71685ab
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/nbgrader/server_extensions/formgrader/base.py b/nbgrader/server_extensions/formgrader/base.py
@@ -3,6 +3,7 @@
 
 from tornado import web
 from notebook.base.handlers import IPythonHandler
+from ...api import Gradebook
 
 
 class BaseHandler(IPythonHandler):
@@ -11,9 +12,18 @@ class BaseHandler(IPythonHandler):
     def base_url(self):
         return super(BaseHandler, self).base_url.rstrip("/")
 
+    @property
+    def db_url(self):
+        return self.settings['nbgrader_db_url']
+
     @property
     def gradebook(self):
-        return self.settings['nbgrader_gradebook']
+        self.log.debug("getting gradebook")
+        gb = self.settings['nbgrader_gradebook']
+        if gb is None:
+            gb = Gradebook(self.db_url)
+            self.settings['nbgrader_gradebook'] = gb
+        return gb
 
     @property
     def mathjax_url(self):

diff --git a/nbgrader/server_extensions/formgrader/formgrader.py b/nbgrader/server_extensions/formgrader/formgrader.py
@@ -8,7 +8,6 @@
 
 from . import handlers, apihandlers
 from ...apps.baseapp import NbGrader
-from ...api import Gradebook
 
 
 class FormgradeExtension(NbGrader):
@@ -38,7 +37,8 @@ def init_tornado_settings(self, webapp):
             nbgrader_notebook_dir_format=self.coursedir.directory_structure,
             nbgrader_step=self.coursedir.autograded_directory,
             nbgrader_exporter=HTMLExporter(config=self.config),
-            nbgrader_gradebook=Gradebook(self.coursedir.db_url),
+            nbgrader_gradebook=None,
+            nbgrader_db_url=self.coursedir.db_url,
             nbgrader_jinja2_env=jinja_env,
             nbgrader_notebook_url_prefix=os.path.relpath(self.coursedir.root)
         )