Merge branch 'joulez-pserve.verbosity'

3 files changed, 34 insertions, 17 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 8292a2382..457bfc7b7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -121,6 +121,12 @@ Features
   https://github.com/Pylons/pyramid/pull/1004 and
   https://github.com/Pylons/pyramid/pull/1046
 
+- The ``pserve`` command now takes a ``-v`` (or ``--verbose``) flag and a
+  ``-q`` (or ``--quiet``) flag.  Output from running ``pserve`` can be
+  controlled using these flags.  ``-v`` can be specified multiple times to
+  increase verbosity.  ``-q`` sets verbosity to ``0`` unconditionally.  The
+  default verbosity level is ``1``.
+
 Bug Fixes
 ---------
 
diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py
index b840fbdb9..cc368d721 100644
--- a/pyramid/scripts/pserve.py
+++ b/pyramid/scripts/pserve.py
@@ -65,7 +65,7 @@ class PServeCommand(object):
     You can also include variable assignments like 'http_port=8080'
     and then use %(http_port)s in your config files.
     """
-    verbose = 1
+    default_verbosity = 1
 
     parser = optparse.OptionParser(
         usage,
@@ -125,6 +125,18 @@ class PServeCommand(object):
         action='store_true',
         dest='show_status',
         help="Show the status of the (presumably daemonized) server")
+    parser.add_option(
+        '-v', '--verbose',
+        default=default_verbosity,
+        dest='verbose',
+        action='count',
+        help="Set verbose level (default "+str(default_verbosity)+")")
+    parser.add_option(
+        '-q', '--quiet',
+        action='store_const',
+        const=0,
+        dest='verbose',
+        help="Suppress verbose output")
 
     if hasattr(os, 'setuid'):
         # I don't think these are available on Windows
@@ -148,19 +160,18 @@ class PServeCommand(object):
 
     _scheme_re = re.compile(r'^[a-z][a-z]+:', re.I)
 
-    default_verbosity = 1
-
     _reloader_environ_key = 'PYTHON_RELOADER_SHOULD_RUN'
     _monitor_environ_key = 'PASTE_MONITOR_SHOULD_RUN'
 
     possible_subcommands = ('start', 'stop', 'restart', 'status')
 
     def __init__(self, argv, quiet=False):
-        self.quiet = quiet
         self.options, self.args = self.parser.parse_args(argv[1:])
+        if quiet:
+            self.options.verbose = 0
 
     def out(self, msg): # pragma: no cover
-        if not self.quiet:
+        if self.options.verbose > 0:
             print(msg)
 
     def get_options(self):
@@ -197,7 +208,7 @@ class PServeCommand(object):
 
         if self.options.reload:
             if os.environ.get(self._reloader_environ_key):
-                if self.verbose > 1:
+                if self.options.verbose > 1:
                     self.out('Running reloading file monitor')
                 install_reloader(int(self.options.reload_interval), [app_spec])
                 # if self.requires_config_file:
@@ -271,7 +282,7 @@ class PServeCommand(object):
             try:
                 self.daemonize()
             except DaemonizeException as ex:
-                if self.verbose > 0:
+                if self.options.verbose > 0:
                     self.out(str(ex))
                 return 2
 
@@ -303,7 +314,7 @@ class PServeCommand(object):
         app = self.loadapp(app_spec, name=app_name, relative_to=base,
                 global_conf=vars)
 
-        if self.verbose > 0:
+        if self.options.verbose > 0:
             if hasattr(os, 'getpid'):
                 msg = 'Starting server in PID %i.' % os.getpid()
             else:
@@ -314,7 +325,7 @@ class PServeCommand(object):
             try:
                 server(app)
             except (SystemExit, KeyboardInterrupt) as e:
-                if self.verbose > 1:
+                if self.options.verbose > 1:
                     raise
                 if str(e):
                     msg = ' ' + str(e)
@@ -358,7 +369,7 @@ class PServeCommand(object):
                 "Daemon is already running (PID: %s from PID file %s)"
                 % (pid, self.options.pid_file))
 
-        if self.verbose > 0:
+        if self.options.verbose > 0:
             self.out('Entering daemon mode')
         pid = os.fork()
         if pid:
@@ -433,11 +444,11 @@ class PServeCommand(object):
 
     def record_pid(self, pid_file):
         pid = os.getpid()
-        if self.verbose > 1:
+        if self.options.verbose > 1:
             self.out('Writing PID %s to %s' % (pid, pid_file))
         with open(pid_file, 'w') as f:
             f.write(str(pid))
-        atexit.register(self._remove_pid_file, pid, pid_file, self.verbose)
+        atexit.register(self._remove_pid_file, pid, pid_file, self.options.verbose)
 
     def stop_daemon(self): # pragma: no cover
         pid_file = self.options.pid_file or 'pyramid.pid'
@@ -490,7 +501,7 @@ class PServeCommand(object):
         self.restart_with_monitor(reloader=True)
 
     def restart_with_monitor(self, reloader=False): # pragma: no cover
-        if self.verbose > 0:
+        if self.options.verbose > 0:
             if reloader:
                 self.out('Starting subprocess with file monitor')
             else:
@@ -511,7 +522,7 @@ class PServeCommand(object):
                     proc = None
                 except KeyboardInterrupt:
                     self.out('^C caught in monitor process')
-                    if self.verbose > 1:
+                    if self.options.verbose > 1:
                         raise
                     return 1
             finally:
@@ -527,7 +538,7 @@ class PServeCommand(object):
                 # a monitor, any exit code will restart
                 if exit_code != 3:
                     return exit_code
-            if self.verbose > 0:
+            if self.options.verbose > 0:
                 self.out('%s %s %s' % ('-' * 20, 'Restarting', '-' * 20))
 
     def change_user_group(self, user, group): # pragma: no cover
@@ -559,7 +570,7 @@ class PServeCommand(object):
             if not gid:
                 gid = entry.pw_gid
             uid = entry.pw_uid
-        if self.verbose > 0:
+        if self.options.verbose > 0:
             self.out('Changing user to %s:%s (%s:%s)' % (
                 user, group or '(unknown)', uid, gid))
         if gid:
diff --git a/pyramid/tests/test_scripts/test_pserve.py b/pyramid/tests/test_scripts/test_pserve.py
index 6e4b0f17d..107ff4c0a 100644
--- a/pyramid/tests/test_scripts/test_pserve.py
+++ b/pyramid/tests/test_scripts/test_pserve.py
@@ -156,7 +156,7 @@ class TestPServeCommand(unittest.TestCase):
         self.pid_file = tempfile.mktemp()
         pid = os.getpid()
         inst = self._makeOne()
-        inst.verbose = verbosity
+        inst.options.verbose = verbosity
 
         try:
             atexit.register = fake_atexit