summaryrefslogtreecommitdiffstats
path: root/module/remote/SocketServer.py
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2009-05-29 13:37:46 +0200
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2009-05-29 13:37:46 +0200
commit37104032902281caefa144ed039b88c4f3b6e81e (patch)
tree560e1ab570dde87edebbbb6c8e28fba30f80e738 /module/remote/SocketServer.py
parentadded download plugin for fileuploadx.de, fixed some bugs (diff)
downloadpyload-37104032902281caefa144ed039b88c4f3b6e81e.tar.xz
socket encryption
Diffstat (limited to 'module/remote/SocketServer.py')
-rw-r--r--module/remote/SocketServer.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/module/remote/SocketServer.py b/module/remote/SocketServer.py
index 3635e16d8..1252547ad 100644
--- a/module/remote/SocketServer.py
+++ b/module/remote/SocketServer.py
@@ -17,7 +17,7 @@ class ServerThread(threading.Thread):
def __init__(self, pycore):
threading.Thread.__init__(self)
self.setDaemon(True)
- self.server = MainServerSocket(7272, pycore)
+ self.server = MainServerSocket(int(pycore.config['port']), pycore)
def run(self):
asyncore.loop()
@@ -52,8 +52,8 @@ class SecondaryServerSocket(asynchat.async_chat):
def collect_incoming_data(self, data):
self.data.append(data)
def found_terminator(self):
- self.handler.proceed(self.data)
- self.push(str(self.pycore.plugins_avaible))
+ rep = self.handler.proceed(self.data)
+ self.push(rep)
self.data = []
#having fun with the data
def handle_close(self):