diff --git a/plugins/python/pyloader.c b/plugins/python/pyloader.c index e608ffaa..5d220890 100644 --- a/plugins/python/pyloader.c +++ b/plugins/python/pyloader.c @@ -380,13 +380,13 @@ int init_uwsgi_app(int loader, void *arg1, struct wsgi_request *wsgi_req, PyThre wi->startup_time = uwsgi_now() - now; if (app_type == PYTHON_APP_TYPE_WSGI) { - uwsgi_log( "WSGI application %d (mountpoint='%.*s') ready in %d seconds on interpreter %p pid: %d%s\n", id, wi->mountpoint_len, wi->mountpoint, (int) wi->startup_time, wi->interpreter, (int) getpid(), default_app); + uwsgi_log( "WSGI app %d (mountpoint='%.*s') ready in %d seconds on interpreter %p pid: %d%s\n", id, wi->mountpoint_len, wi->mountpoint, (int) wi->startup_time, wi->interpreter, (int) getpid(), default_app); } else if (app_type == PYTHON_APP_TYPE_WEB3) { - uwsgi_log( "Web3 application %d (mountpoint='%.*s') ready in %d seconds on interpreter %p pid: %d%s\n", id, wi->mountpoint_len, wi->mountpoint, (int) wi->startup_time, wi->interpreter, (int) getpid(), default_app); + uwsgi_log( "Web3 app %d (mountpoint='%.*s') ready in %d seconds on interpreter %p pid: %d%s\n", id, wi->mountpoint_len, wi->mountpoint, (int) wi->startup_time, wi->interpreter, (int) getpid(), default_app); } else if (app_type == PYTHON_APP_TYPE_PUMP) { - uwsgi_log( "Pump application %d (mountpoint='%.*s') ready in %d seconds on interpreter %p pid: %d%s\n", id, wi->mountpoint_len, wi->mountpoint, (int) wi->startup_time, wi->interpreter, (int) getpid(), default_app); + uwsgi_log( "Pump app %d (mountpoint='%.*s') ready in %d seconds on interpreter %p pid: %d%s\n", id, wi->mountpoint_len, wi->mountpoint, (int) wi->startup_time, wi->interpreter, (int) getpid(), default_app); } diff --git a/plugins/python/uwsgi_pymodule.c b/plugins/python/uwsgi_pymodule.c index 29aeebf5..abfb5eed 100644 --- a/plugins/python/uwsgi_pymodule.c +++ b/plugins/python/uwsgi_pymodule.c @@ -2542,6 +2542,8 @@ PyObject *py_uwsgi_workers(PyObject * self, PyObject * args) { PyDict_SetItemString(apps_dict, "mountpoint", zero); Py_DECREF(zero); + PyDict_SetItemString(apps_dict, "startup_time", PyInt_FromLong((long) ua->startup_time)); + PyDict_SetItemString(apps_dict, "interpreter", PyInt_FromLong((long)ua->interpreter)); PyDict_SetItemString(apps_dict, "callable", PyInt_FromLong((long)ua->interpreter)); diff --git a/welcome.py b/welcome.py index d4842ddd..29a5cd15 100644 --- a/welcome.py +++ b/welcome.py @@ -88,9 +88,9 @@ def application(env, start_response): workers = '' for w in uwsgi.workers(): - apps = '' + apps = '
idmountpointrequests
' for app in w['apps']: - apps += '' % (app['id'], app['mountpoint'], app['requests']) + apps += '' % (app['id'], app['mountpoint'], app['startup_time'], app['requests']) apps += '
idmountpointstartup timerequests
%d%s%d
%d%s%d%d
' workers += """