mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-04 15:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not make Core a thread anymore as it is not needed.

Browse source
This commit is contained in:
Andrew Resch 2008-01-20 00:56:42 +00:00
commit 76a0eb12e8
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
deluge/core/core.py
View file

@ -90,12 +90,11 @@ DEFAULT_PREFS = {
} }
class Core( class Core(
threading.Thread,
ThreadingMixIn, ThreadingMixIn,
SimpleXMLRPCServer.SimpleXMLRPCServer): SimpleXMLRPCServer.SimpleXMLRPCServer):
def __init__(self, port): def __init__(self, port):
log.debug("Core init..") log.debug("Core init..")
threading.Thread.__init__(self) #threading.Thread.__init__(self)
self.client_address = None self.client_address = None
@ -141,6 +140,7 @@ class Core(
gettext.install("deluge", gettext.install("deluge",
pkg_resources.resource_filename( pkg_resources.resource_filename(
"deluge", "i18n")) "deluge", "i18n"))
# Setup signals
try: try:
import gnome.ui import gnome.ui
self.client = gnome.ui.Client() self.client = gnome.ui.Client()
@ -162,7 +162,7 @@ class Core(
result = 1 result = 1
return result return result
SetConsoleCtrlHandler(win_handler) SetConsoleCtrlHandler(win_handler)
def get_request(self): def get_request(self):
"""Get the request and client address from the socket. """Get the request and client address from the socket.
We override this so that we can get the ip address of the client. We override this so that we can get the ip address of the client.
@ -173,7 +173,7 @@ class Core(
def run(self): def run(self):
"""Starts the core""" """Starts the core"""
# Create the client fingerprint # Create the client fingerprint
version = [] version = []
for value in deluge.common.get_version().split("."): for value in deluge.common.get_version().split("."):
@ -250,7 +250,7 @@ class Core(
self.loop = gobject.MainLoop() self.loop = gobject.MainLoop()
self.loop.run() self.loop.run()
def _shutdown(self): def _shutdown(self, data=None):
"""This is called by a thread from shutdown()""" """This is called by a thread from shutdown()"""
log.info("Shutting down core..") log.info("Shutting down core..")
component.shutdown() component.shutdown()

4
deluge/core/daemon.py
View file

@ -37,7 +37,5 @@ from deluge.log import LOG as log
class Daemon: class Daemon:
def __init__(self, port): def __init__(self, port):
# Start the core as a thread and join it until it's done # Start the core as a thread and join it until it's done
self.core = Core(port) self.core = Core(port).run()
self.core.start()
self.core.join()