← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/server.py

  • Committer: John Arbash Meinel
  • Date: 2011-09-15 12:03:23 UTC
  • mto: (6133.4.49 2.5-soft-hangup-795025)
  • mto: This revision was merged to the branch mainline in revision 6170.
  • Revision ID: john@arbash-meinel.com-20110915120323-1trvuysr9uyk3rhr
Change the name from _create_handler to _make_handler, to match similar code in the file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/server.py
183
183
        """Return the url of the server"""
184
184
        return "bzr://%s:%s/" % (self._sockname[0], self._sockname[1])
185
185
 
186
 
    def _create_handler(self, conn):
 
186
    def _make_handler(self, conn):
187
187
        return medium.SmartServerSocketStreamMedium(
188
188
            conn, self.backing_transport, self.root_client_path,
189
189
            timeout=self._client_timeout)
194
194
        conn.setblocking(True)
195
195
        conn.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
196
196
        thread_name = 'smart-server-child' + thread_name_suffix
197
 
        handler = self._create_handler(conn)
 
197
        handler = self._make_handler(conn)
198
198
        connection_thread = threading.Thread(
199
199
            None, handler.serve, name=thread_name)
200
200
        # FIXME: This thread is never joined, it should at least be collected