Revert "Simplify hook handler config code"

This reverts commit cbbafdb9b1f8b0f04c7a0d174b5d56962e6bdbfe.

gunicorn/config.py

@@ -1496,10 +1496,9 @@ class OnStarting(Setting):
     validator = validate_callable(1)
     type = six.callable
 
-    @staticmethod
-    def default(server):
+    def on_starting(server):
         pass
-
+    default = staticmethod(on_starting)
     desc = """\
         Called just before the master process is initialized.
 
@@ -1513,10 +1512,9 @@ class OnReload(Setting):
     validator = validate_callable(1)
     type = six.callable
 
-    @staticmethod
-    def default(server):
+    def on_reload(server):
         pass
-
+    default = staticmethod(on_reload)
     desc = """\
         Called to recycle workers during a reload via SIGHUP.
 
@@ -1530,10 +1528,9 @@ class WhenReady(Setting):
     validator = validate_callable(1)
     type = six.callable
 
-    @staticmethod
-    def default(server):
+    def when_ready(server):
         pass
-
+    default = staticmethod(when_ready)
     desc = """\
         Called just after the server is started.
 
@@ -1547,10 +1544,9 @@ class Prefork(Setting):
     validator = validate_callable(2)
     type = six.callable
 
-    @staticmethod
-    def default(server, worker):
+    def pre_fork(server, worker):
         pass
-
+    default = staticmethod(pre_fork)
     desc = """\
         Called just before a worker is forked.
 
@@ -1565,10 +1561,9 @@ class Postfork(Setting):
     validator = validate_callable(2)
     type = six.callable
 
-    @staticmethod
-    def default(server, worker):
+    def post_fork(server, worker):
         pass
-
+    default = staticmethod(post_fork)
     desc = """\
         Called just after a worker has been forked.
 
@@ -1583,10 +1578,10 @@ class PostWorkerInit(Setting):
     validator = validate_callable(1)
     type = six.callable
 
-    @staticmethod
-    def default(worker):
+    def post_worker_init(worker):
         pass
 
+    default = staticmethod(post_worker_init)
     desc = """\
         Called just after a worker has initialized the application.
 
@@ -1600,10 +1595,10 @@ class WorkerInt(Setting):
     validator = validate_callable(1)
     type = six.callable
 
-    @staticmethod
-    def default(worker):
+    def worker_int(worker):
         pass
 
+    default = staticmethod(worker_int)
     desc = """\
         Called just after a worker exited on SIGINT or SIGQUIT.
 
@@ -1618,11 +1613,10 @@ class WorkerAbort(Setting):
     validator = validate_callable(1)
     type = six.callable
 
-
-    @staticmethod
-    def default(worker):
+    def worker_abort(worker):
         pass
 
+    default = staticmethod(worker_abort)
     desc = """\
         Called when a worker received the SIGABRT signal.
 
@@ -1639,10 +1633,9 @@ class PreExec(Setting):
     validator = validate_callable(1)
     type = six.callable
 
-    @staticmethod
-    def default(server):
+    def pre_exec(server):
         pass
-
+    default = staticmethod(pre_exec)
     desc = """\
         Called just before a new master process is forked.
 
@@ -1656,10 +1649,9 @@ class PreRequest(Setting):
     validator = validate_callable(2)
     type = six.callable
 
-    @staticmethod
-    def default(worker, req):
+    def pre_request(worker, req):
         worker.log.debug("%s %s" % (req.method, req.path))
-
+    default = staticmethod(pre_request)
     desc = """\
         Called just before a worker processes the request.
 
@@ -1674,10 +1666,9 @@ class PostRequest(Setting):
     validator = validate_post_request
     type = six.callable
 
-    @staticmethod
-    def default(worker, req, environ, resp):
+    def post_request(worker, req, environ, resp):
         pass
-
+    default = staticmethod(post_request)
     desc = """\
         Called after a worker processes the request.
 
@@ -1692,10 +1683,9 @@ class ChildExit(Setting):
     validator = validate_callable(2)
     type = six.callable
 
-    @staticmethod
-    def default(server, worker):
+    def child_exit(server, worker):
         pass
-
+    default = staticmethod(child_exit)
     desc = """\
         Called just after a worker has been exited, in the master process.
 
@@ -1712,10 +1702,9 @@ class WorkerExit(Setting):
     validator = validate_callable(2)
     type = six.callable
 
-    @staticmethod
-    def default(server, worker):
+    def worker_exit(server, worker):
         pass
-
+    default = staticmethod(worker_exit)
     desc = """\
         Called just after a worker has been exited, in the worker process.
 
@@ -1730,10 +1719,9 @@ class NumWorkersChanged(Setting):
     validator = validate_callable(3)
     type = six.callable
 
-    @staticmethod
-    def default(server, new_value, old_value):
+    def nworkers_changed(server, new_value, old_value):
         pass
-
+    default = staticmethod(nworkers_changed)
     desc = """\
         Called just after *num_workers* has been changed.
 
@@ -1749,10 +1737,10 @@ class OnExit(Setting):
     section = "Server Hooks"
     validator = validate_callable(1)
 
-    @staticmethod
-    def default(server):
+    def on_exit(server):
         pass
 
+    default = staticmethod(on_exit)
     desc = """\
         Called just before exiting Gunicorn.