Skip to content

Commit

Permalink
simplify SSLserver, no fork()s anymore
Browse files Browse the repository at this point in the history
  • Loading branch information
tcatm committed Jan 13, 2011
1 parent 06f7962 commit ed46f67
Showing 1 changed file with 2 additions and 21 deletions.
23 changes: 2 additions & 21 deletions SSLserver.py
Expand Up @@ -5,7 +5,6 @@
# file license.txt or http://www.opensource.org/licenses/mit-license.php.

import socket, os, time, shutil, signal
from multiprocessing import Process, current_process, freeze_support
from SocketServer import BaseServer, ThreadingMixIn
from optparse import OptionParser
import ssl
Expand Down Expand Up @@ -147,23 +146,6 @@ def send_head(self):
self.end_headers()
return f

def serve_forever(server):
try:
server.serve_forever()
except KeyboardInterrupt:
pass


def runpool(options):
server = SecureHTTPServer(('', options.port), RequestHandler, options)

# create child processes to act as workers
for i in range(options.procs-1):
Process(target=serve_forever, args=(server,)).start()

# main process also acts as a worker
serve_forever(server)

parser = OptionParser()
parser.add_option('-r', dest='url', default='http://localhost:8332/', help='URL to bitcoin RPC (default: %default)')
parser.add_option('-p', dest='port', type="int", default=8338, help='listen port (default: %default)')
Expand All @@ -173,8 +155,7 @@ def runpool(options):

(options, args) = parser.parse_args()

freeze_support()

print 'Ctrl-C to exit'

runpool(options)
server = SecureHTTPServer(('', options.port), RequestHandler, options)
server.serve_forever()

0 comments on commit ed46f67

Please sign in to comment.