Merge lp:~cmiller/desktopcouch/remote-oauth-for-replication into lp:desktopcouch

[Chad Miller]

    Use the oauth tokens we stored at pairing time to talk to the remote end.
    (LP: #439412)

    Retreive oauth information from pairing records and give it back in the info
    about pairings.

    Log exceptions in replication and catch them, instead of letting them percolate
    up to the caller.

[Stuart Langridge (sil)]

I don't understand why this:

101 + try:
102 + raise last_exception
103 + except:
104 + logging.exception("failed to unpair from other end.")
105 + continue

Why raise an exception and then immediately catch it again?

review: Needs Fixing

[Eric Casteleijn (thisfred)]

Looks good, tests pass

review: Approve

[lp:~cmiller/desktopcouch/remote-oauth-for-replication]

77. By Chad Miller on 2009-09-30

Document ugliness that is confusing if you don't know that logging.exception
peeks at the currently handled exception and logs the stack trace at a level
of Error.

[Chad Miller (cmiller)]

> I don't understand why this:
>
> 101 + try:
> 102 + raise last_exception
> 103 + except:
> 104 + logging.exception("failed to unpair from other end.")
> 105 + continue
>
> Why raise an exception and then immediately catch it again?

I want to log an exception that I caught earlier, and logging.exception looks for current exception information.

[Stuart Langridge (sil)]

Cool, happy now!

review: Approve

=== modified file 'desktopcouch/pair/couchdb_pairing/couchdb_io.py'
--- desktopcouch/pair/couchdb_pairing/couchdb_io.py	2009-09-28 18:58:18 +0000
+++ desktopcouch/pair/couchdb_pairing/couchdb_io.py	2009-09-30 19:34:09 +0000
@@ -158,6 +158,8 @@
         v = dict()
         v["record_id"] = row.id
         v["active"] = True
+        if "oauth" in row.value:
+            v["oauth"] = row.value["oauth"]
         if "unpaired" in row.value:
             v["active"] = not row.value["unpaired"]
         hostid = row.value["pairing_identifier"]
@@ -216,15 +218,15 @@
 
         if target_host:
             # Target databases must exist before replicating to them.
-            logging.debug("creating %r %s:%d", target_database, target_host,
-                    target_port)
+            logging.debug("creating %r %s:%d %s", target_database, target_host,
+                    target_port, target_oauth)
             create_database(target_host, target_port, target_database,
                     target_ssl, target_oauth)
+        logging.debug("db exists, and we're ready to replicate")
     except:
-        logging.exception("can't talk to couchdb.  %r %s:%d  oauth=%s", 
+        logging.exception("can't create/verify %r %s:%d  oauth=%s", 
                 target_database, target_host, target_port, target_oauth)
 
-    logging.debug("db exists, and we're ready to replicate")
     try:
         # regardless of source and target, we talk to our local couchdb  :(
         port = int(desktopcouch_find_port())
@@ -239,8 +241,7 @@
         logging.debug("replicate result:  %r  %r", resp, data)
         ###
     except:
-        logging.error("can't talk to couchdb.  %r <== %r", url, record)
-        raise
+        logging.exception("can't send %r  %r <== %r", source_database, url, record)
 
 def get_pairings(uri=None):
     """Get a list of paired servers."""

=== modified file 'desktopcouch/pair/couchdb_pairing/dbus_io.py'
--- desktopcouch/pair/couchdb_pairing/dbus_io.py	2009-09-14 15:56:42 +0000
+++ desktopcouch/pair/couchdb_pairing/dbus_io.py	2009-09-30 19:34:09 +0000
@@ -141,7 +141,13 @@
 def get_seen_paired_hosts():
     pairing_encyclopedia = couchdb_io.get_all_known_pairings()
     return (
-            (uuid, addr, port, pairing_encyclopedia[uuid]["active"]) 
+            (
+                uuid, 
+                addr, 
+                port, 
+                not pairing_encyclopedia[uuid]["active"], 
+                pairing_encyclopedia[uuid]["oauth"],
+            ) 
             for uuid, (addr, port) 
             in nearby_desktop_couch_instances.items() 
             if uuid in pairing_encyclopedia)

=== modified file 'desktopcouch/records/server_base.py'
--- desktopcouch/records/server_base.py	2009-09-28 15:37:18 +0000
+++ desktopcouch/records/server_base.py	2009-09-30 19:34:09 +0000
@@ -73,8 +73,6 @@
         )
         req.sign_request(oauth.OAuthSignatureMethod_HMAC_SHA1(), consumer, access_token)
         headers.update(httplib2._normalize_headers(req.to_header()))
-        for header in headers.iteritems():
-            logging.debug("header  %s", header)
 
 class OAuthCapableHttp(httplib2.Http):
     """Subclass of httplib2.Http which specifically uses our OAuth 

=== modified file 'desktopcouch/replication.py'
--- desktopcouch/replication.py	2009-09-28 16:01:11 +0000
+++ desktopcouch/replication.py	2009-09-30 19:34:09 +0000
@@ -83,7 +83,7 @@
             # that we have paired with.  Now, it's time to send our changes to
             # all those.
 
-            for remote_hostid, addr, port, is_unpaired in \
+            for remote_hostid, addr, port, is_unpaired, remote_oauth in \
                     dbus_io.get_seen_paired_hosts():
 
                 if is_unpaired:
@@ -94,14 +94,20 @@
                         try:
                             # Tell her gently, using each pseudonym. 
                             couchdb_io.expunge_pairing(local_identifier, 
-                                    couchdb_io.mkuri(addr, port))
+                                    couchdb_io.mkuri(addr, port), remote_oauth)
                             count += 1
                         except Exception, e:
                             last_exception = e
                     if count == 0:
                         if last_exception is not None:
                             # If she didn't recognize us, something's wrong.
-                            raise last_exception
+                            try:
+                                raise last_exception
+                                # push caught exception back...
+                            except:
+                                # ... so that we log it here.
+                                logging.exception("failed to unpair from other end.")
+                                continue
                     else:
                         # Finally, find your inner peace...
                         couchdb_io.expunge_pairing(remote_identifier)
@@ -116,7 +122,8 @@
                     if not is_running: return
                     couchdb_io.replicate(db_name, db_name,
                             target_host=addr, target_port=port, 
-                            source_port=local_port)
+                            source_port=local_port, target_oauth=remote_oauth)
+            log.debug("replication of discovered hosts finished")
         except Exception, e:
             log.exception("replication of discovered hosts aborted")
             pass