dave
/
docker-nodepupper
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid loading objects when db is closed

This commit is contained in:
dave 2019-04-06 19:06:38 -07:00
parent d4503a7fb3
commit 5c15ae1bbc
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nodepupper/daemon.py
View File

@ -80,8 +80,8 @@ class AppWeb(object):
""" """
with self.nodes.db.transaction() as c: with self.nodes.db.transaction() as c:
ret = { ret = {
"classnames": c.root.classes.keys(), "classnames": list(c.root.classes.keys()),
"nodenames": c.root.nodes.keys(), "nodenames": list(c.root.nodes.keys()),
# "all_albums": [], # "all_albums": [],
"path": cherrypy.request.path_info, "path": cherrypy.request.path_info,
"auth": True or auth() "auth": True or auth()
@ -102,14 +102,14 @@ class AppWeb(object):
raise cherrypy.HTTPRedirect("node/{}".format(fqdn), 302) raise cherrypy.HTTPRedirect("node/{}".format(fqdn), 302)
with self.nodes.db.transaction() as c: with self.nodes.db.transaction() as c:
yield self.render("node_edit.html", node=c.root.nodes.get(node, None)) return self.render("node_edit.html", node=c.root.nodes.get(node, None))
@cherrypy.expose @cherrypy.expose
def index(self): def index(self):
""" """
""" """
with self.nodes.db.transaction() as c: with self.nodes.db.transaction() as c:
yield self.render("nodes.html", nodes=c.root.nodes.values()) return self.render("nodes.html", nodes=c.root.nodes.values())
# raise cherrypy.HTTPRedirect('feed', 302) # raise cherrypy.HTTPRedirect('feed', 302)
@cherrypy.expose @cherrypy.expose
@ -146,7 +146,7 @@ class AppWeb(object):
@cherrypy.expose @cherrypy.expose
def error(self, status, message, traceback, version): def error(self, status, message, traceback, version):
yield self.render("error.html", status=status, message=message, traceback=traceback) return self.render("error.html", status=status, message=message, traceback=traceback)
@cherrypy.expose @cherrypy.expose
@ -222,7 +222,7 @@ class NodesWeb(object):
@cherrypy.expose @cherrypy.expose
def index(self, node): def index(self, node):
with self.nodes.db.transaction() as c: with self.nodes.db.transaction() as c:
yield self.render("node.html", node=c.root.nodes[node]) return self.render("node.html", node=c.root.nodes[node])
@cherrypy.expose @cherrypy.expose
def op(self, node, op, clsname=None, config=None, parent=None): def op(self, node, op, clsname=None, config=None, parent=None):
@ -249,12 +249,12 @@ class ClassWeb(object):
@cherrypy.expose @cherrypy.expose
def index(self, cls=None): def index(self, cls=None):
# with self.nodes.db.transaction() as c: # with self.nodes.db.transaction() as c:
yield self.render("classes.html") return self.render("classes.html")
@cherrypy.expose @cherrypy.expose
def op(self, cls, op=None, name=None): def op(self, cls, op=None, name=None):
# with self.nodes.db.transaction() as c: # with self.nodes.db.transaction() as c:
yield self.render("classes.html") return self.render("classes.html")
@cherrypy.expose @cherrypy.expose
def add(self, op, name): def add(self, op, name):