Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
26352174
J
jumpserver
项目概览
gjl2004yn
/
jumpserver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jumpserver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
26352174
编写于
11月 11, 2016
作者:
baltery
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update celery
上级
c6fc3dfe
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
55 addition
and
28 deletion
+55
-28
apps/audits/tasks.py
apps/audits/tasks.py
+2
-1
apps/celerybeat-schedule.db
apps/celerybeat-schedule.db
+0
-0
apps/celerybeat.pid
apps/celerybeat.pid
+1
-0
apps/common/__init__.py
apps/common/__init__.py
+1
-1
apps/common/celery.py
apps/common/celery.py
+20
-21
apps/common/tasks.py
apps/common/tasks.py
+31
-5
未找到文件。
apps/audits/tasks.py
浏览文件 @
26352174
...
...
@@ -8,4 +8,5 @@ from .utils import write_login_log
@
shared_task
def
write_login_log_async
(
*
args
,
**
kwargs
):
write_login_log
(
*
args
,
**
kwargs
)
\ No newline at end of file
write_login_log
(
*
args
,
**
kwargs
)
apps/celerybeat-schedule.db
0 → 100644
浏览文件 @
26352174
apps/celerybeat.pid
0 → 100644
浏览文件 @
26352174
64256
apps/common/__init__.py
浏览文件 @
26352174
...
...
@@ -2,5 +2,5 @@ from __future__ import absolute_import
# This will make sure the app is always imported when
# Django starts so that shared_task will use this app.
from
.celery
import
app
as
celery_app
#
from .celery import app as celery_app
apps/common/celery.py
浏览文件 @
26352174
# ~*~ coding: utf-8 ~*~
from
__future__
import
absolute_import
,
unicode_literals
import
os
from
celery
import
Celery
# set the default Django settings module for the 'celery' program.
os
.
environ
.
setdefault
(
'DJANGO_SETTINGS_MODULE'
,
'jumpserver.settings'
)
from
django.conf
import
settings
app
=
Celery
(
'jumpserver'
)
# Using a string here means the worker will not have to
# pickle the object when using Windows.
app
.
config_from_object
(
'django.conf:settings'
)
app
.
autodiscover_tasks
(
lambda
:
[
app_config
.
split
(
'.'
)[
0
]
for
app_config
in
settings
.
INSTALLED_APPS
])
# # ~*~ coding: utf-8 ~*~
#
# from __future__ import absolute_import, unicode_literals
# import os
#
# from celery import Celery
#
# # set the default Django settings module for the 'celery' program.
# os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'jumpserver.settings')
#
# from django.conf import settings
#
# app = Celery('jumpserver')
#
# # Using a string here means the worker will not have to
# # pickle the object when using Windows.
# app.config_from_object('django.conf:settings')
#
# app.autodiscover_tasks(lambda: [app_config.split('.')[0] for app_config in settings.INSTALLED_APPS])
#
apps/common/tasks.py
浏览文件 @
26352174
from
__future__
import
absolute_import
import
os
from
celery
import
shared_task
from
celery.schedules
import
crontab
from
django.core.mail
import
send_mail
# from django.conf import settings
# from common import celery_app
from
celery
import
Celery
# set the default Django settings module for the 'celery' program.
os
.
environ
.
setdefault
(
'DJANGO_SETTINGS_MODULE'
,
'jumpserver.settings'
)
from
django.conf
import
settings
app
=
Celery
(
'jumpserver'
)
@
shared_task
(
name
=
'send_mail_async'
)
# Using a string here means the worker will not have to
# pickle the object when using Windows.
app
.
config_from_object
(
'django.conf:settings'
)
app
.
autodiscover_tasks
(
lambda
:
[
app_config
.
split
(
'.'
)[
0
]
for
app_config
in
settings
.
INSTALLED_APPS
])
@
app
.
task
def
send_mail_async
(
*
args
,
**
kwargs
):
""" Using celery to send email async
...
...
@@ -28,7 +46,15 @@ def send_mail_async(*args, **kwargs):
send_mail
(
*
args
,
**
kwargs
)
# def send_mail_async(subject, message, from_mail, recipient_list, fail_silently=False, html_message=None):
# if settings.CONFIG.MAIL_SUBJECT_PREFIX:
# subject += settings.CONFIG.MAIL_SUBJECT_PREFIX
# send_mail(subject, message, from_mail, recipient_list, fail_silently=fail_silently, html_message=html_message)
# @celery_app.task
# def test(arg):
# print(arg)
# celery_app.conf.beat_schedule = {
# 'add-every-30-seconds': {
# 'task': 'common.test',
# 'schedule': crontab(minute='*/1'),
# 'args': ('nihao',)
# }
# }
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录