launchpad-reviewers team mailing list archive

[Gavin Panella <gavin.panella@xxxxxxxxxxxxx>]

Gavin Panella has proposed merging lp:~allenap/launchpad/fix-librarian-startup-warnings into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~allenap/launchpad/fix-librarian-startup-warnings/+merge/53018

Silence the librarian warnings when starting up:

.../daemons/librarian.tac:66: DeprecationWarning: Unqualified strport description passed to 'service'.Use qualified endpoint descriptions; for example, 'tcp:58090'.
  strports.service(str(uploadPort), upload_factory).setServiceParent(
.../daemons/librarian.tac:74: DeprecationWarning: Unqualified strport description passed to 'service'.Use qualified endpoint descriptions; for example, 'tcp:58080'.
  strports.service(str(webPort), site).setServiceParent(librarianService)
.../daemons/librarian.tac:66: DeprecationWarning: Unqualified strport description passed to 'service'.Use qualified endpoint descriptions; for example, 'tcp:58095'.
  strports.service(str(uploadPort), upload_factory).setServiceParent(
.../daemons/librarian.tac:74: DeprecationWarning: Unqualified strport description passed to 'service'.Use qualified endpoint descriptions; for example, 'tcp:58085'.
  strports.service(str(webPort), site).setServiceParent(librarianService)

-- 
https://code.launchpad.net/~allenap/launchpad/fix-librarian-startup-warnings/+merge/53018
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~allenap/launchpad/fix-librarian-startup-warnings into lp:launchpad.

=== modified file 'daemons/librarian.tac'
--- daemons/librarian.tac	2010-11-26 01:45:08 +0000
+++ daemons/librarian.tac	2011-03-11 13:42:23 +0000
@@ -63,7 +63,7 @@
     librarian_storage = storage.LibrarianStorage(
         path, db.Library(restricted=restricted))
     upload_factory = FileUploadFactory(librarian_storage)
-    strports.service(str(uploadPort), upload_factory).setServiceParent(
+    strports.service("tcp:%d" % uploadPort, upload_factory).setServiceParent(
         librarianService)
     root = fatweb.LibraryFileResource(
         librarian_storage, upstreamHost, upstreamPort)
@@ -71,7 +71,8 @@
     root.putChild('robots.txt', fatweb.robotsTxt)
     site = server.Site(root)
     site.displayTracebacks = False
-    strports.service(str(webPort), site).setServiceParent(librarianService)
+    strports.service("tcp:%d" % webPort, site).setServiceParent(
+        librarianService)
 
 if os.environ.get('LP_TEST_INSTANCE'):
     # Running in ephemeral mode: allocate ports on demand.