##// END OF EJS Templates
httpservice: move sys.exit() out of serve_forever()...
Martin von Zweigbergk -
r46422:b7b8a153 default
parent child Browse files
Show More
@@ -6348,6 +6348,7 b' def serve(ui, repo, **opts):'
6348 )
6348 )
6349 s = wireprotoserver.sshserver(ui, repo)
6349 s = wireprotoserver.sshserver(ui, repo)
6350 s.serve_forever()
6350 s.serve_forever()
6351 sys.exit(0)
6351
6352
6352 service = server.createservice(ui, repo, opts)
6353 service = server.createservice(ui, repo, opts)
6353 return server.runservice(opts, initfn=service.init, runfn=service.run)
6354 return server.runservice(opts, initfn=service.init, runfn=service.run)
@@ -3376,6 +3376,7 b' def debugserve(ui, repo, **opts):'
3376
3376
3377 s = wireprotoserver.sshserver(ui, repo, logfh=logfh)
3377 s = wireprotoserver.sshserver(ui, repo, logfh=logfh)
3378 s.serve_forever()
3378 s.serve_forever()
3379 sys.exit(0)
3379
3380
3380
3381
3381 @command(b'debugsetparents', [], _(b'REV1 [REV2]'))
3382 @command(b'debugsetparents', [], _(b'REV1 [REV2]'))
@@ -9,6 +9,7 b''
9 from __future__ import absolute_import
9 from __future__ import absolute_import
10
10
11 import os
11 import os
12 import sys
12
13
13 from ..i18n import _
14 from ..i18n import _
14
15
@@ -111,6 +112,7 b' class httpservice(object):'
111
112
112 def run(self):
113 def run(self):
113 self.httpd.serve_forever()
114 self.httpd.serve_forever()
115 sys.exit(0)
114
116
115
117
116 def createapp(baseui, repo, webconf):
118 def createapp(baseui, repo, webconf):
@@ -8,7 +8,6 b' from __future__ import absolute_import'
8
8
9 import contextlib
9 import contextlib
10 import struct
10 import struct
11 import sys
12 import threading
11 import threading
13
12
14 from .i18n import _
13 from .i18n import _
@@ -851,7 +850,6 b' class sshserver(object):'
851 def serve_forever(self):
850 def serve_forever(self):
852 self.serveuntil(threading.Event())
851 self.serveuntil(threading.Event())
853 self._ui.restorefinout(self._fin, self._fout)
852 self._ui.restorefinout(self._fin, self._fout)
854 sys.exit(0)
855
853
856 def serveuntil(self, ev):
854 def serveuntil(self, ev):
857 """Serve until a threading.Event is set."""
855 """Serve until a threading.Event is set."""
General Comments 0
You need to be logged in to leave comments. Login now