summaryrefslogtreecommitdiffstats
path: root/module/plugins/hooks/ClickAndLoad.py
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/hooks/ClickAndLoad.py')
-rw-r--r--module/plugins/hooks/ClickAndLoad.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/module/plugins/hooks/ClickAndLoad.py b/module/plugins/hooks/ClickAndLoad.py
index b1009420a..109452105 100644
--- a/module/plugins/hooks/ClickAndLoad.py
+++ b/module/plugins/hooks/ClickAndLoad.py
@@ -29,7 +29,7 @@ def forward(source, destination):
class ClickAndLoad(Hook):
__name__ = "ClickAndLoad"
__type__ = "hook"
- __version__ = "0.44"
+ __version__ = "0.45"
__config__ = [("activated", "bool", "Activated" , True),
("port" , "int" , "Port" , 9666),
@@ -52,9 +52,9 @@ class ClickAndLoad(Hook):
if not self.core.config.get("webinterface", "activated"):
return
- ip = "" if self.getConfig('extern') else "127.0.0.1"
+ ip = "" if self.get_config('extern') else "127.0.0.1"
webport = self.core.config.get("webinterface", "port")
- cnlport = self.getConfig('port')
+ cnlport = self.get_config('port')
self.proxy(ip, webport, cnlport)
@@ -63,7 +63,7 @@ class ClickAndLoad(Hook):
def proxy(self, ip, webport, cnlport):
time.sleep(10) #@TODO: Remove in 0.4.10 (implement addon delay on startup)
- self.logInfo(_("Proxy listening on %s:%s") % (ip or "0.0.0.0", cnlport))
+ self.log_info(_("Proxy listening on %s:%s") % (ip or "0.0.0.0", cnlport))
self._server(ip, webport, cnlport)
@@ -81,7 +81,7 @@ class ClickAndLoad(Hook):
while True:
client_socket, client_addr = dock_socket.accept()
- self.logDebug("Connection from %s:%s" % client_addr)
+ self.log_debug("Connection from %s:%s" % client_addr)
server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -90,12 +90,12 @@ class ClickAndLoad(Hook):
server_socket = ssl.wrap_socket(server_socket)
except NameError:
- self.logError(_("pyLoad's webinterface is configured to use HTTPS, Please install python's ssl lib or disable HTTPS"))
+ self.log_error(_("pyLoad's webinterface is configured to use HTTPS, Please install python's ssl lib or disable HTTPS"))
client_socket.close() #: reset the connection.
continue
except Exception, e:
- self.logError(_("SSL error: %s") % e.message)
+ self.log_error(_("SSL error: %s") % e.message)
client_socket.close() #: reset the connection.
continue
@@ -105,10 +105,10 @@ class ClickAndLoad(Hook):
self.manager.startThread(forward, server_socket, client_socket)
except socket.timeout:
- self.logDebug("Connection timed out, retrying...")
+ self.log_debug("Connection timed out, retrying...")
return self._server(ip, webport, cnlport)
except socket.error, e:
- self.logError(e)
+ self.log_error(e)
time.sleep(240)
return self._server(ip, webport, cnlport)