Mercurial > code > home > repos > light9
changeset 911:4b9997ab0e4f
push some logs down to debug. -v flag on SC. another tripleFilter optimization
Ignore-this: 41de7e838ff6c775ee4e350f4dfa141d
| author | Drew Perttula <drewp@bigasterisk.com> |
|---|---|
| date | Mon, 10 Jun 2013 09:58:59 +0000 |
| parents | 3a15fb921b9c |
| children | 9674c9f015bb |
| files | bin/subcomposer light9/Submaster.py light9/rdfdb/patchsender.py light9/rdfdb/syncedgraph.py |
| diffstat | 4 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/bin/subcomposer Mon Jun 10 09:52:15 2013 +0000 +++ b/bin/subcomposer Mon Jun 10 09:58:59 2013 +0000 @@ -109,9 +109,9 @@ graph.patchObject(self.session, self.session, L9['currentSub'], newSub.uri) - with graph.currentState() as current: - - if newSub and (newSub.uri, RDF.type, L9['LocalSubmaster']) in current: + localStmt = (newSub.uri, RDF.type, L9['LocalSubmaster']) + with graph.currentState(tripleFilter=localStmt) as current: + if newSub and localStmt in current: self._currentChoice(Local) else: # i think right here is the point that the last local @@ -196,9 +196,13 @@ parser = OptionParser(usage="%prog [suburi]") parser.add_option('--no-geometry', action='store_true', help="don't save/restore window geometry") + parser.add_option('-v', action='store_true', help="log debug level") + clientsession.add_option(parser) opts, args = parser.parse_args() + log.setLevel(logging.DEBUG if opts.v else logging.INFO) + root=tk.Tk() root.config(bg='black') root.tk_setPalette("#004633")
--- a/light9/Submaster.py Mon Jun 10 09:52:15 2013 +0000 +++ b/light9/Submaster.py Mon Jun 10 09:58:59 2013 +0000 @@ -148,11 +148,11 @@ self.name = self.graph.label(self.uri) def setLevels(self): - log.info("sub update levels") + log.debug("sub update levels") oldLevels = getattr(self, 'levels', {}).copy() self.setLevelsFromGraph() if oldLevels != self.levels: - log.info("sub %s changed" % self.name) + log.debug("sub %s changed" % self.name) # dispatcher too? this would help subcomposer dispatcher.send("sub levels changed", sub=self)
--- a/light9/rdfdb/patchsender.py Mon Jun 10 09:52:15 2013 +0000 +++ b/light9/rdfdb/patchsender.py Mon Jun 10 09:58:59 2013 +0000 @@ -41,7 +41,7 @@ if not self._patchesToSend or self._currentSendPatchRequest: return if len(self._patchesToSend) > 1: - log.info("%s patches left to send", len(self._patchesToSend)) + log.debug("%s patches left to send", len(self._patchesToSend)) # this is where we could concatenate little patches into a # bigger one. Often, many statements will cancel each # other out. not working yet:
--- a/light9/rdfdb/syncedgraph.py Mon Jun 10 09:52:15 2013 +0000 +++ b/light9/rdfdb/syncedgraph.py Mon Jun 10 09:58:59 2013 +0000 @@ -106,7 +106,7 @@ # these could fail if we're out of sync. One approach: # Rerequest the full state from the server, try the patch # again after that, then give up. - log.info("del %s add %s", [q[2] for q in p.delQuads], [q[2] for q in p.addQuads]) + log.debug("del %s add %s", [q[2] for q in p.delQuads], [q[2] for q in p.addQuads]) try: patchQuads(self._graph, p.delQuads, p.addQuads, perfect=True) except ValueError: