Added tasks app
This commit is contained in:
parent
b97160b935
commit
27dbe6ca8d
18
TODO.md
18
TODO.md
|
@ -361,4 +361,20 @@ Collecting lxml==3.3.5 (from -r re (line 22))
|
||||||
|
|
||||||
# project settings modified copy of django's default project settings
|
# project settings modified copy of django's default project settings
|
||||||
|
|
||||||
# migrate accounts break on superuser insert because of orders signals
|
# migrate accounts break on superuser insert because of orders signals: read() + db_ready()
|
||||||
|
|
||||||
|
# if backend.async: don't join
|
||||||
|
|
||||||
|
# ngnix setup certificate
|
||||||
|
from orchestra.contrib.tasks import task
|
||||||
|
import time, sys
|
||||||
|
@task(name='rata')
|
||||||
|
def counter(num, log):
|
||||||
|
for i in range(1, num):
|
||||||
|
with open(log, 'a') as handler:
|
||||||
|
handler.write(str(i))
|
||||||
|
sys.stderr.write('hola\n')
|
||||||
|
time.sleep(1)
|
||||||
|
counter.apply_async(10, '/tmp/kakas')
|
||||||
|
|
||||||
|
# standard django deployment pracices (run checks)
|
||||||
|
|
|
@ -148,6 +148,7 @@ class Resource(models.Model):
|
||||||
|
|
||||||
def monitor(self, async=True):
|
def monitor(self, async=True):
|
||||||
if async:
|
if async:
|
||||||
|
print(tasks.monitor.delay)
|
||||||
return tasks.monitor.delay(self.pk, async=async)
|
return tasks.monitor.delay(self.pk, async=async)
|
||||||
return tasks.monitor(self.pk, async=async)
|
return tasks.monitor(self.pk, async=async)
|
||||||
|
|
||||||
|
|
|
@ -50,15 +50,3 @@ def monitor(resource_id, ids=None, async=True):
|
||||||
triggers.append(op)
|
triggers.append(op)
|
||||||
Operation.execute(triggers)
|
Operation.execute(triggers)
|
||||||
return logs
|
return logs
|
||||||
|
|
||||||
|
|
||||||
from orchestra.contrib.tasks import task
|
|
||||||
import time, sys
|
|
||||||
@task(name='rata')
|
|
||||||
def counter(num, log):
|
|
||||||
for i in range(1, num):
|
|
||||||
with open(log, 'a') as handler:
|
|
||||||
handler.write(str(i))
|
|
||||||
# sys.stderr.write('hola\n')
|
|
||||||
time.sleep(1)
|
|
||||||
#counter.apply_async(10, '/tmp/kakas')
|
|
||||||
|
|
|
@ -103,6 +103,7 @@ class SettingFileView(generic.TemplateView):
|
||||||
return context
|
return context
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
admin.site.register_url(r'^settings/setting/view/$', SettingFileView.as_view(), 'settings_setting_view')
|
admin.site.register_url(r'^settings/setting/view/$', SettingFileView.as_view(), 'settings_setting_view')
|
||||||
admin.site.register_url(r'^settings/setting/$', SettingView.as_view(), 'settings_setting_change')
|
admin.site.register_url(r'^settings/setting/$', SettingView.as_view(), 'settings_setting_change')
|
||||||
OrchestraIndexDashboard.register_link('Administration', 'settings_setting_change', _("Settings"))
|
OrchestraIndexDashboard.register_link('Administration', 'settings_setting_change', _("Settings"))
|
||||||
|
|
|
@ -52,7 +52,7 @@ def apply_async(fn, name=None, method='thread'):
|
||||||
def inner(fn, name, method, *args, **kwargs):
|
def inner(fn, name, method, *args, **kwargs):
|
||||||
task_id = get_id()
|
task_id = get_id()
|
||||||
args = (task_id, name) + args
|
args = (task_id, name) + args
|
||||||
thread = Process(target=fn, args=args, kwargs=kwargs)
|
thread = method(target=fn, args=args, kwargs=kwargs)
|
||||||
thread.start()
|
thread.start()
|
||||||
# Celery API compat
|
# Celery API compat
|
||||||
thread.request = AttrDict(id=task_id)
|
thread.request = AttrDict(id=task_id)
|
||||||
|
@ -66,28 +66,25 @@ def apply_async(fn, name=None, method='thread'):
|
||||||
else:
|
else:
|
||||||
raise NotImplementedError("Support for %s concurrency method is not supported." % method)
|
raise NotImplementedError("Support for %s concurrency method is not supported." % method)
|
||||||
fn.apply_async = partial(inner, close_connection(keep_state(fn)), name, method)
|
fn.apply_async = partial(inner, close_connection(keep_state(fn)), name, method)
|
||||||
|
fn.delay = fn.apply_async
|
||||||
return fn
|
return fn
|
||||||
|
|
||||||
|
|
||||||
def apply_async_override(fn, name):
|
|
||||||
if fn is None:
|
|
||||||
def decorator(fn):
|
|
||||||
return update_wrapper(apply_async(fn), fn)
|
|
||||||
return decorator
|
|
||||||
return update_wrapper(apply_async(fn, name), fn)
|
|
||||||
|
|
||||||
|
|
||||||
def task(fn=None, **kwargs):
|
def task(fn=None, **kwargs):
|
||||||
# TODO override this if 'celerybeat' in sys.argv ?
|
# TODO override this if 'celerybeat' in sys.argv ?
|
||||||
from . import settings
|
from . import settings
|
||||||
# register task
|
# register task
|
||||||
if fn is None:
|
if fn is None:
|
||||||
fn = celery_shared_task(**kwargs)
|
if settings.TASKS_BACKEND in ('thread', 'process'):
|
||||||
else:
|
def decorator(fn):
|
||||||
fn = celery_shared_task(fn)
|
return apply_async(celery_shared_task(fn))
|
||||||
|
return decorator
|
||||||
|
else:
|
||||||
|
return celery_shared_task(**kwargs)
|
||||||
|
fn = update_wraper(partial(celery_shared_task, fn))
|
||||||
if settings.TASKS_BACKEND in ('thread', 'process'):
|
if settings.TASKS_BACKEND in ('thread', 'process'):
|
||||||
name = kwargs.pop('name', None)
|
name = kwargs.pop('name', None)
|
||||||
apply_async_override(fn, name)
|
fn = update_wrapper(apply_async(fn, name), fn)
|
||||||
return fn
|
return fn
|
||||||
|
|
||||||
|
|
||||||
|
@ -95,10 +92,14 @@ def periodic_task(fn=None, **kwargs):
|
||||||
from . import settings
|
from . import settings
|
||||||
# register task
|
# register task
|
||||||
if fn is None:
|
if fn is None:
|
||||||
fn = celery_periodic_task(**kwargs)
|
if settings.TASKS_BACKEND in ('thread', 'process'):
|
||||||
else:
|
def decorator(fn):
|
||||||
fn = celery_periodic_task(fn)
|
return apply_async(celery_periodic_task(fn))
|
||||||
|
return decorator
|
||||||
|
else:
|
||||||
|
return celery_periodic_task(**kwargs)
|
||||||
|
fn = update_wraper(partial(celery_periodic_task, fn))
|
||||||
if settings.TASKS_BACKEND in ('thread', 'process'):
|
if settings.TASKS_BACKEND in ('thread', 'process'):
|
||||||
name = kwargs.pop('name', None)
|
name = kwargs.pop('name', None)
|
||||||
apply_async_override(fn, name)
|
fn = update_wrapper(apply_async(fn, name), fn)
|
||||||
return fn
|
return fn
|
||||||
|
|
Loading…
Reference in New Issue