From 38a5cae36ebeb1894fa3c6a5c2f2eb2d58fe293b Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 15 Nov 2014 01:39:26 +0100 Subject: [Plugin] Fix wait routine 2 --- module/plugins/Plugin.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'module/plugins/Plugin.py') diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py index 4dadb67b4..1be74e896 100644 --- a/module/plugins/Plugin.py +++ b/module/plugins/Plugin.py @@ -326,9 +326,8 @@ class Plugin(Base): status = pyfile.status pyfile.setStatus("waiting") - self.logDebug("WAIT: %d seconds" % seconds, - "WAITUNTIL: %f" % pyfile.waitUntil, - "RECONNECT: %s" % self.wantReconnect) + self.logInfo(_("Wait: %d seconds") % pyfile.waitUntil - time(), + _("Reconnect: %s") % self.wantReconnect) if self.account: self.logDebug("Ignore reconnection due account logged") @@ -336,6 +335,8 @@ class Plugin(Base): while pyfile.waitUntil > time(): if pyfile.abort: self.abort() + + sleep(1) else: while pyfile.waitUntil > time(): self.thread.m.reconnecting.wait(2) @@ -348,6 +349,8 @@ class Plugin(Base): self.wantReconnect = False raise Reconnect + sleep(1) + self.waiting = False pyfile.status = status -- cgit v1.2.3