Merge lp:~jtv/launchpad/bug-684669 into lp:launchpad

[Jeroen T. Vermeulen]

[r=bac,stub][ui=none] [r=bac][ui=none][bug=684669] Log database connections.

= Bug 684669 =

When we have problems with scripts, we keep running into the same questions: what store(s) are we connected to? As what database user? What database backend processes are connected to our process?

In this branch I add a bit of logging when connecting to the main database. It provides all this information, as well as the isolation level.

The extra information is logged at DEBUG2, so add lots of -v.

Jeroen

[Brad Crittenden (bac)]

review: Approve (code)

[Stuart Bishop (stub)]

You can now do 'logging.debug2(msg, args)' and avoid the import.

I didn't realize we could drop the test_suite() now. Cool!

review: Approve (code)

[Brad Crittenden (bac)]

Please clean up the commit message before landing. It looks like the code creating the message doesn't handle multiple reviewers very well.

=== modified file 'lib/canonical/launchpad/webapp/adapter.py'
--- lib/canonical/launchpad/webapp/adapter.py	2010-11-17 09:49:16 +0000
+++ lib/canonical/launchpad/webapp/adapter.py	2010-12-03 18:33:47 +0000
@@ -68,6 +68,7 @@
 from canonical.lazr.utils import get_current_browser_request, safe_hasattr
 from canonical.lazr.timeout import set_default_timeout_function
 from lp.services import features
+from lp.services.log.loglevels import DEBUG2
 from lp.services.timeline.timeline import Timeline
 from lp.services.timeline.requesttimeline import (
     get_request_timeline,
@@ -487,6 +488,11 @@
                 'DB connection URL %s does not meet naming convention.')
 
         _reset_dirty_commit_flags(*flags)
+
+        logging.log(
+            DEBUG2,
+            "Connected to %s backend %d, as user %s, at isolation level %s.",
+            flavor, raw_connection.get_backend_pid(), dbuser, self._isolation)
         return raw_connection
 
     @property

=== modified file 'lib/lp/soyuz/doc/archive-override-check.txt'
--- lib/lp/soyuz/doc/archive-override-check.txt	2009-04-28 12:59:43 +0000
+++ lib/lp/soyuz/doc/archive-override-check.txt	2010-12-03 18:33:47 +0000
@@ -22,7 +22,7 @@
   >>> script = os.path.join(config.root, "scripts", "ftpmaster-tools",
   ...                       "archive-override-check.py")
 
-  >>> process = subprocess.Popen([sys.executable, script, "-vv",
+  >>> process = subprocess.Popen([sys.executable, script, "-v",
   ...                             "-d", "ubuntu",
   ...                             "-s", "warty"],
   ...                            stdout=subprocess.PIPE,

=== modified file 'lib/lp/soyuz/doc/soyuz-upload.txt'
--- lib/lp/soyuz/doc/soyuz-upload.txt	2010-11-06 12:45:26 +0000
+++ lib/lp/soyuz/doc/soyuz-upload.txt	2010-12-03 18:33:47 +0000
@@ -738,7 +738,7 @@
 
   >>> script = os.path.join(config.root, "scripts", "ftpmaster-tools",
   ...                       "archive-cruft-check.py")
-  >>> process = subprocess.Popen([sys.executable, script, "-vvn",
+  >>> process = subprocess.Popen([sys.executable, script, "-vn",
   ...                             "-d", "ubuntutest",
   ...                             "-s", "breezy-autotest",
   ...                             "/var/tmp/archive"],

=== modified file 'lib/lp/translations/doc/poexport-request.txt'
--- lib/lp/translations/doc/poexport-request.txt	2010-08-17 11:54:55 +0000
+++ lib/lp/translations/doc/poexport-request.txt	2010-12-03 18:33:47 +0000
@@ -263,7 +263,7 @@
 
     >>> import subprocess
     >>> process = subprocess.Popen([
-    ...     sys.executable, 'cronscripts/rosetta-export-queue.py', '-vv'
+    ...     sys.executable, 'cronscripts/rosetta-export-queue.py', '-v'
     ...     ], stdin=subprocess.PIPE, stdout=subprocess.PIPE,
     ...     stderr=subprocess.STDOUT
     ...     )

=== modified file 'lib/lp/translations/scripts/tests/test_reupload_translations.py'
--- lib/lp/translations/scripts/tests/test_reupload_translations.py	2010-10-04 19:50:45 +0000
+++ lib/lp/translations/scripts/tests/test_reupload_translations.py	2010-12-03 18:33:47 +0000
@@ -10,7 +10,6 @@
 import re
 from StringIO import StringIO
 import tarfile
-from unittest import TestLoader
 
 import transaction
 from zope.security.proxy import removeSecurityProxy
@@ -38,6 +37,7 @@
     getLatestTranslationsUploads method return the given library file
     alias.
     """
+
     def __init__(self, script, tar_alias):
         self.tar_alias = tar_alias
         self.script = script
@@ -190,7 +190,7 @@
                 '-s', self.distroseries.name,
                 '-p', self.sourcepackagename1.name,
                 '-p', self.sourcepackagename2.name,
-                '-vv',
+                '-v',
                 '--dry-run',
             ])
 
@@ -207,7 +207,3 @@
         self.assertTrue(
             re.match(expected_output, stderr),
             'expected %s, got %s' % (expected_output, stderr))
-
-
-def test_suite():
-    return TestLoader().loadTestsFromName(__name__)