Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commandserver.py @ 29532:dda6bf886839
commandserver: extract _cleanup() hook to clarify chg is doing differently
This makes it clear that chg needs its own way to unlink closed socket file.
I made a mistake in draft patches without noting the difference.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sun, 22 May 2016 11:21:11 +0900 |
| parents | e5b4d79a9140 |
| children | 6011ad3b0a42 |
comparison
equal
deleted
inserted
replaced
| 29531:b439a2a268eb | 29532:dda6bf886839 |
|---|---|
| 401 repo = self.repo | 401 repo = self.repo |
| 402 self.server = cls(self.address, _requesthandler) | 402 self.server = cls(self.address, _requesthandler) |
| 403 self.ui.status(_('listening at %s\n') % self.address) | 403 self.ui.status(_('listening at %s\n') % self.address) |
| 404 self.ui.flush() # avoid buffering of status message | 404 self.ui.flush() # avoid buffering of status message |
| 405 | 405 |
| 406 def _cleanup(self): | |
| 407 os.unlink(self.address) | |
| 408 | |
| 406 def run(self): | 409 def run(self): |
| 407 try: | 410 try: |
| 408 self.server.serve_forever() | 411 self.server.serve_forever() |
| 409 finally: | 412 finally: |
| 410 os.unlink(self.address) | 413 self._cleanup() |
| 411 | 414 |
| 412 _servicemap = { | 415 _servicemap = { |
| 413 'pipe': pipeservice, | 416 'pipe': pipeservice, |
| 414 'unix': unixservice, | 417 'unix': unixservice, |
| 415 } | 418 } |