light9 Changeset - b2745bcab19d

Changeset - b2745bcab19d

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Drew Perttula - 9 years ago 2016-05-30 21:41:43
drewp@bigasterisk.com

clearer error if connection to rdfdb fails
Ignore-this: b706833d04c9836479bedefb5b66e751

1 file changed with 11 insertions and 5 deletions:

light9/rdfdb/patchreceiver.py

0 comments (0 inline, 0 general)

light9/rdfdb/patchreceiver.py

➞

Show inline comments

@@ @@ -7,53 +7,59 @@ log = logging.getLogger('syncedgraph') @@
 class PatchReceiver(object):
     """
     runs a web server in this process and registers it with the rdfdb
     master. See onPatch for what happens when the rdfdb master sends
     us a patch
     """
     def __init__(self, rdfdbRoot, label, onPatch):
         """
         label is what we'll call ourselves to the rdfdb server
         onPatch is what we call back when the server sends a patch
         """
         self.rdfdbRoot = rdfdbRoot
         listen = reactor.listenTCP(0, cyclone.web.Application(handlers=[
             (r'/update', makePatchEndpoint(onPatch)),
         ]))
         port = listen._realPortNumber  # what's the right call for this?
         self.updateResource = 'http://%s:%s/update' % (
             networking.patchReceiverUpdateHost.value, port)
         log.info("listening on %s" % port)
         self._register(label)
     def _register(self, label):
         url = self.rdfdbRoot + 'graphClients'
         body = urllib.urlencode([('clientUpdate', self.updateResource),
                                  ('label', label)])
         cyclone.httpclient.fetch(
-            url=self.rdfdbRoot + 'graphClients',
+            url=url,
             method='POST',
             headers={'Content-Type': ['application/x-www-form-urlencoded']},
             postdata=urllib.urlencode([('clientUpdate', self.updateResource),
                                        ('label', label)]),
             ).addCallbacks(self._done, log.error)
             postdata=body,
             ).addCallbacks(self._done,
                            lambda err: self._registerError(err, url, body))
         log.info("registering with rdfdb")
     def _registerError(self, err, url, body):
         log.error('registering to url=%r body=%r', url, body)
         log.error(err)
     def _done(self, x):
         log.debug("registered with rdfdb")
 def makePatchEndpointPutMethod(cb):
     def put(self):
         try:
             p = Patch(jsonRepr=self.request.body)
             log.debug("received patch -%d +%d" % (len(p.delGraph), len(p.addGraph)))
             cb(p)
         except:
             traceback.print_exc()
             raise
     return put
 def makePatchEndpoint(cb):
     class Update(cyclone.web.RequestHandler):
         put = makePatchEndpointPutMethod(cb)
     return Update

0 comments (0 inline, 0 general)