celery/celery — pull request #1335 by mhahn (2013-04-30 21:13:54+00:00)
Title: Support `CELERY_TASK_TIME_LIMIT` and `CELERY_TASK_SOFT_TIME_LIMIT`

The comments in the Task class specified these settings as defaults for
`time_limit` and `soft_time_limit` respectively. However, the Task class
never actually pulled their values from the configs.

`CELERYD_TASK_TIME_LIMIT` and `CELERYD_TASK_SOFT_TIME_LIMIT` take precedence over the time_limits set on the task. I think it is important to support setting a default time_limit for tasks, say 15 min, while allowing an individual task to set a time_limit of say, 30 seconds.

I saw that you already had tests for "on_timeout" I wasn't sure where/how you would prefer these to be tested. Am happy to write tests if you point me in the right direction.