Made the custom management commands respect --verbosity=0.

django · Jan 28, 2011 · 7ec3ea7 · 7ec3ea7
1 parent fed3b32
commit 7ec3ea7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/django_website/aggregator/management/commands/update_feeds.py b/django_website/aggregator/management/commands/update_feeds.py
@@ -34,7 +34,11 @@ def handle(self, *args, **kwargs):
             sys.exit(1)
 
         try:
-            verbose = kwargs.get('verbosity')
+            verbose = int(kwargs['verbosity']) > 0
+        except (KeyError, TypeError, ValueError):
+            verbose = True
+
+        try:
             socket.setdefaulttimeout(15)
             self.update_feeds(verbose=verbose, num_threads=kwargs['threads'])
         except:
@@ -50,7 +54,7 @@ def update_feeds(self, verbose=False, num_threads=4):
 
         threadpool = []
         for i in range(num_threads):
-            threadpool.append(FeedUpdateWorker(feed_queue, verbose))
+            threadpool.append(FeedUpdateWorker(q=feed_queue, verbose=verbose))
 
         [t.start() for t in threadpool]
         [t.join() for t in threadpool]

diff --git a/django_website/docs/management/commands/update_docs.py b/django_website/docs/management/commands/update_docs.py
@@ -13,8 +13,15 @@
 
 class Command(NoArgsCommand):
     def handle_noargs(self, **kwargs):
+        try:
+            verbose = int(kwargs['verbosity']) > 0
+        except (KeyError, TypeError, ValueError):
+            verbose = True
+
         for release in DocumentRelease.objects.all():
-            print "Updating %s..." % release
+            if verbose:
+                print "Updating %s..." % release
+
             destdir = Path(settings.DOCS_BUILD_ROOT).child(release.lang, release.version)
             if not destdir.exists():
                 destdir.mkdir(parents=True)