Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backports for 2.0.28 #2690

Merged
merged 4 commits into from
Oct 26, 2024
Merged

Backports for 2.0.28 #2690

merged 4 commits into from
Oct 26, 2024

Conversation

xrmx
Copy link
Collaborator

@xrmx xrmx commented Oct 26, 2024

No description provided.

Lalufu and others added 4 commits October 26, 2024 11:47
* Fix reload-on-touch/change

As part of a fix for unbit#2656, commit 8f1d0e5 introduced a measure to wait
for processes to finish work while reloading. The code to do this
affects other logic flows was well, breaking the ability to reload uwsgi
when a config file changes.

This moves the code around a bit so unbit#2656 stays fixed, but
reload-on-touch/change works again.

Fixes unbit#2681.

* Apply suggestions from code review

---------

Co-authored-by: Riccardo Magliocchetti <[email protected]>
* integration-tests: better handling of failures

* integration-tests: use notfound as basic request plugin

* allow --need-app=0 on command line

* integration tests: rename plugins to test envvar to avoid conflict with uwsgi

* integration tests: add basic test for jvm jwsgi

* integration tests: add basic test for psgi

* integration tests: add basic test for cgi

* integration tests: add basic test for Ruby rack

* integration tests: fix failure when run from another dir

* fix test_classic_mountpoints with py3 (Fixes unbit#2554)

* integration tests: include manage_script_name tests

* integration tests: factor test GET body code
Under certain circumstances Py_ENABLE_SHARED would be False but the static library cannot be found. For example, if you use conda environments or if you use specific versions of MacOS unbit#2109, unbit#2270. pip install would fail in such a situation.

In this PR, we adjust the configurations so that the installation script would attempt to use shared library instead of the static one if no static library is found. This fixes pip install for Python 3.10.15 | packaged by conda-forge. It's not clear if this would fix the MacOS problems mentioned in the above issues though, as I am unable to verify those problems.
@xrmx xrmx merged commit 02a2fc4 into unbit:uwsgi-2.0 Oct 26, 2024
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants