Mercurial > public > mercurial-scm > hg
comparison mercurial/commandserver.py @ 29587:536eec443b4a
commandserver: rename _serveworker() to _runworker()
"run" sounds more natural as the function does never listen for new connection.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 16 Jul 2016 14:46:31 +0900 |
| parents | 42cdba9cfee4 |
| children | 1bb94666b9fc |
comparison
equal
deleted
inserted
replaced
| 29586:42cdba9cfee4 | 29587:536eec443b4a |
|---|---|
| 482 h.newconnection() | 482 h.newconnection() |
| 483 finally: | 483 finally: |
| 484 conn.close() # release handle in parent process | 484 conn.close() # release handle in parent process |
| 485 else: | 485 else: |
| 486 try: | 486 try: |
| 487 self._serveworker(conn) | 487 self._runworker(conn) |
| 488 conn.close() | 488 conn.close() |
| 489 os._exit(0) | 489 os._exit(0) |
| 490 except: # never return, hence no re-raises | 490 except: # never return, hence no re-raises |
| 491 try: | 491 try: |
| 492 self.ui.traceback(force=True) | 492 self.ui.traceback(force=True) |
| 512 # no waitable child processes | 512 # no waitable child processes |
| 513 return | 513 return |
| 514 self.ui.debug('worker process exited (pid=%d)\n' % pid) | 514 self.ui.debug('worker process exited (pid=%d)\n' % pid) |
| 515 self._workerpids.discard(pid) | 515 self._workerpids.discard(pid) |
| 516 | 516 |
| 517 def _serveworker(self, conn): | 517 def _runworker(self, conn): |
| 518 signal.signal(signal.SIGCHLD, self._oldsigchldhandler) | 518 signal.signal(signal.SIGCHLD, self._oldsigchldhandler) |
| 519 _initworkerprocess() | 519 _initworkerprocess() |
| 520 h = self._servicehandler | 520 h = self._servicehandler |
| 521 try: | 521 try: |
| 522 _serverequest(self.ui, self.repo, conn, h.createcmdserver) | 522 _serverequest(self.ui, self.repo, conn, h.createcmdserver) |