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.

Sign up for GitHub

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

Jump to bottom

[FIX] Threading stack overflow size #6

Merged
merged 2 commits into from
Feb 7, 2017
Merged

[FIX] Threading stack overflow size #6

merged 2 commits into from
Feb 7, 2017

Conversation

lasley
Copy link
Member

@lasley lasley commented Feb 7, 2017

@lasley
[FIX] Threading stack overflow size
a058663 
* Fix threading stack overflow size from python-pillow/Pillow#1935
@lasley lasley self-assigned this Feb 7, 2017
@lasley lasley requested a review from tedsalmon February 7, 2017 20:46
tedsalmon
tedsalmon approved these changes Feb 7, 2017
View reviewed changes
Copy link
Contributor

@tedsalmon tedsalmon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unless awk is different in alpine; there's a change required :o

Other than that, LGTM! 👍

Dockerfile Outdated
@@ -132,6 +132,10 @@ RUN if [ "$ODOO_VERSION" != "10.0" ]; \
ln -s /usr/local/bin/openerp-server /usr/local/bin/odoo; \
fi

# Fix stack size overflow
# https://github.com/python-pillow/Pillow/issues/1935
RUN awk '/import/ { print; print "import threading; threading.stack_size(4*80*1024)"; next }1' /usr/local/bin/odoo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awk doesn't edit in place; you'll need to redirect stdout to the file in question

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh yup, I obviously didn't test after I switched from simply copying a new odoo-bin!

@lasley
Copy link
Member Author

lasley commented Feb 7, 2017

Awk fixed

@lasley lasley merged commit 4a6b2c5 into master Feb 7, 2017
@lasley lasley deleted the hotfix/threading-stack branch February 7, 2017 22:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tedsalmon tedsalmon tedsalmon approved these changes

Assignees

@lasley lasley

Labels
bug ready for review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lasley @tedsalmon