Merge lp:~suligap/canonical-identity-provider/charm-talisker-soft-request-timeout into lp:~ubuntuone-pqm-team/canonical-identity-provider/charm

Proposed by Przemysław Suliga
Status: Merged
Approved by: Daniel Manrique
Approved revision: 91
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp:~suligap/canonical-identity-provider/charm-talisker-soft-request-timeout
Merge into: lp:~ubuntuone-pqm-team/canonical-identity-provider/charm
Diff against target: 12 lines (+1/-1)
1 file modified
playbook.yaml (+1/-1)
To merge this branch: bzr merge lp:~suligap/canonical-identity-provider/charm-talisker-soft-request-timeout
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+384493@code.launchpad.net

Commit message

Enable soft request timeout warnings from talisker

Description of the change

Set to 2500 milliseconds (same as SSO's settings.HANDLER_TIMEOUT_MILLIS)
This is part of move to talisker and SSO's raven setup standarisation:
https://code.launchpad.net/~suligap/canonical-identity-provider/+git/canonical-identity-provider/+merge/384254

To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

Dumb question, why isn't this set in SSO's settings_base.py ? it's not a setting we change often, and I fear putting it in the charm config will make it difficult to locate if we do need to change it.

review: Needs Information
Revision history for this message
Przemysław Suliga (suligap) wrote :

I agree that this might be harder to find now. But this is a talisker setting. It's not Django specific and talisker doesn't support plucking it out of Django settings module for example. It's WSGI server level functionality (and config) with talisker.

Revision history for this message
Daniel Manrique (roadmr) wrote :

The explanation makes sense, thanks for bearing with me. Let's merge!

review: Approve
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'playbook.yaml'
2--- playbook.yaml 2019-04-19 10:59:33 +0000
3+++ playbook.yaml 2020-05-25 09:00:38 +0000
4@@ -77,7 +77,7 @@
5 wsgi_user: "{{ user }}"
6 wsgi_group: "{{ user }}"
7 wsgi_application: django_project.wsgi
8- env_extra: "DJANGO_SETTINGS_MODULE={{ DJANGO_SETTINGS_MODULE }}"
9+ env_extra: "DJANGO_SETTINGS_MODULE={{ DJANGO_SETTINGS_MODULE }} TALISKER_SOFT_REQUEST_TIMEOUT=2500"
10 # clean up any old config in the relation
11 wsgi_extra: ""
12 wsgi_extra_config: |

Subscribers

People subscribed via source and target branches