summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-12-13 23:22:08 +0100
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-12-13 23:22:08 +0100
commitf9f25e064678eeaa96d91d3af7b543334b24bc4c (patch)
tree8c056fb5442377aa541ec2ff15f0c44e37e54f6b
parentmissing files added (diff)
downloadpyload-f9f25e064678eeaa96d91d3af7b543334b24bc4c.tar.xz
little fix
-rw-r--r--module/common/APIExerciser.py8
-rw-r--r--module/database/FileDatabase.py6
2 files changed, 7 insertions, 7 deletions
diff --git a/module/common/APIExerciser.py b/module/common/APIExerciser.py
index f782efa53..96f5ce9cf 100644
--- a/module/common/APIExerciser.py
+++ b/module/common/APIExerciser.py
@@ -31,7 +31,7 @@ sumCalled = 0
def startApiExerciser(core, n):
for i in range(n):
- APIExerciser(core)
+ APIExerciser(core).start()
class APIExerciser(Thread):
@@ -53,14 +53,14 @@ class APIExerciser(Thread):
self.id = idPool
- if core:
- self.core.log.info("API Excerciser started %d" % self.id)
-
idPool += 1
#self.start()
def run(self):
+
+ self.core.log.info("API Excerciser started %d" % self.id)
+
out = open("error.log", "ab")
#core errors are not logged of course
out.write("\n" + "Starting\n")
diff --git a/module/database/FileDatabase.py b/module/database/FileDatabase.py
index f1c917b0a..90e6ee758 100644
--- a/module/database/FileDatabase.py
+++ b/module/database/FileDatabase.py
@@ -151,13 +151,13 @@ class FileHandler:
"""delete package and all contained links"""
p = self.getPackage(id)
- oldorder = p.order
- queue = p.queue
-
if not p:
if id in self.packageCache: del self.packageCache[id]
return
+ oldorder = p.order
+ queue = p.queue
+
e = RemoveEvent("pack", id, "collector" if not p.queue else "queue")
pyfiles = self.cache.values()