diff --git a/master_utils.c b/master_utils.c index d652cbaa..3442ed1f 100644 --- a/master_utils.c +++ b/master_utils.c @@ -728,7 +728,7 @@ void uwsgi_send_stats(int fd) { if (uwsgi.workers[i + 1].cheaped) { fprintf(output, "\"status\": \"cheap\", "); } - else if (uwsgi.workers[i + 1].suspended) { + else if (uwsgi.workers[i + 1].suspended && !uwsgi.workers[i + 1].busy) { fprintf(output, "\"status\": \"pause\", "); } else { diff --git a/plugins/python/uwsgi_pymodule.c b/plugins/python/uwsgi_pymodule.c index abfb5eed..42e5b1f8 100644 --- a/plugins/python/uwsgi_pymodule.c +++ b/plugins/python/uwsgi_pymodule.c @@ -2466,7 +2466,7 @@ PyObject *py_uwsgi_workers(PyObject * self, PyObject * args) { if (uwsgi.workers[i + 1].cheaped) { zero = PyString_FromString("cheap"); } - else if (uwsgi.workers[i + 1].suspended) { + else if (uwsgi.workers[i + 1].suspended && !uwsgi.workers[i + 1].busy) { zero = PyString_FromString("pause"); } else { diff --git a/uwsgi.c b/uwsgi.c index e548d7f8..25437358 100644 --- a/uwsgi.c +++ b/uwsgi.c @@ -83,7 +83,7 @@ static struct uwsgi_option uwsgi_base_options[] = { {"daemonize", required_argument, 'd', "daemonize uWSGI", uwsgi_opt_set_str, &uwsgi.daemonize, 0}, {"stop", required_argument, 0, "stop an instance", uwsgi_opt_pidfile_signal, (void *) SIGINT, UWSGI_OPT_IMMEDIATE}, {"reload", required_argument, 0, "reload an instance", uwsgi_opt_pidfile_signal, (void *) SIGHUP, UWSGI_OPT_IMMEDIATE}, - {"pause", required_argument, 0, "pause an instance", uwsgi_opt_pidfile_signal, (void *) SIGTSTP,UWSGI_OPT_IMMEDIATE}, + {"pause", required_argument, 0, "pause an instance", uwsgi_opt_pidfile_signal, (void *) SIGTSTP, UWSGI_OPT_IMMEDIATE}, {"suspend", required_argument, 0, "suspend an instance", uwsgi_opt_pidfile_signal, (void *) SIGTSTP,UWSGI_OPT_IMMEDIATE}, {"resume", required_argument, 0, "resume an instance", uwsgi_opt_pidfile_signal, (void *) SIGTSTP,UWSGI_OPT_IMMEDIATE}, {"listen", required_argument, 'l', "set the socket listen queue size", uwsgi_opt_set_int, &uwsgi.listen_queue,0},