[SCM] live-studio branch, master, updated. be51da814fb12d25dce46a7f078a46f5c89bd777
Chris Lamb
lamby at debian.org
Fri Jul 30 02:52:35 UTC 2010
The following commit has been merged in the master branch:
commit 37796d7a999cbac312f3eb611b3f714476583c67
Author: Chris Lamb <lamby at debian.org>
Date: Thu Jul 29 14:33:59 2010 -0400
Use logging over print statements.
Signed-off-by: Chris Lamb <lamby at debian.org>
diff --git a/live_studio/queue/management/commands/queue_runner.py b/live_studio/queue/management/commands/queue_runner.py
index 35414cd..58d7574 100644
--- a/live_studio/queue/management/commands/queue_runner.py
+++ b/live_studio/queue/management/commands/queue_runner.py
@@ -1,5 +1,6 @@
import time
import shutil
+import logging
import datetime
import tempfile
import traceback
@@ -10,31 +11,39 @@ from live_studio.queue.models import Entry
class Command(NoArgsCommand):
def handle_noargs(self, **options):
- self.verbose = int(options['verbosity']) > 1
+ logging.basicConfig(level=logging.INFO)
+ self.log = logging.getLogger('live-studio-runner')
+
+ if int(options['verbosity']) > 1:
+ self.log.setLevel(logging.DEBUG)
while True:
try:
entry = Entry.objects.pop()
def update(**kwargs):
- print entry.pk, kwargs
+ self.log.debug('Updating #%d with %r', entry.pk, kwargs)
Entry.objects.filter(pk=entry.pk).update(**kwargs)
update(started=datetime.datetime.utcnow())
-
tempdir = tempfile.mkdtemp(prefix='live-studio_')
+ self.log.info("Building #%d in %s", entry.pk, tempdir)
+
try:
self.handle_entry(entry, tempdir)
- update(success=True)
+ update(finished=datetime.datetime.utcnow(), success=True)
+ self.log.info("Entry #%d built successfully", entry.pk)
except:
- traceback.print_exc()
+ update(finished=datetime.datetime.utcnow())
+ self.log.exception("Entry #%d failed", entry.pk)
continue
finally:
- update(finished=datetime.datetime.utcnow())
shutil.rmtree(tempdir)
+ self.log.info("Finished processing #%d", entry.pk)
except IndexError:
+ self.log.debug('No items in queue, sleeping for 2s')
time.sleep(2)
def handle_entry(self, entry, tempdir):
--
live-studio
More information about the debian-live-changes
mailing list