Support for redis and gevent for the task server
This commit is contained in:
parent
76bec5ba30
commit
ba7fd8dcc9
2 changed files with 17 additions and 5 deletions
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
|
||||
"packages": ["urllib3", "paramiko", "gevent"],
|
||||
"packages": ["urllib3", "paramiko", "gevent", "redis", "rq"],
|
||||
"models": ["mtest"]
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,19 +7,25 @@ from paramecio2.libraries.db.extrafields.datefield import DateField
|
|||
from paramecio2.libraries.db.extrafields.dictfield import DictField
|
||||
from paramecio2.libraries.db.extrafields.jsonfield import JsonValueField
|
||||
from paramecio2.libraries.i18n import I18n
|
||||
from settings import config
|
||||
import urllib3
|
||||
try:
|
||||
import ujson as json
|
||||
except:
|
||||
import json
|
||||
|
||||
#from redis import Redis
|
||||
#from rq import Queue
|
||||
from redis import Redis
|
||||
from rq import Queue
|
||||
import importlib
|
||||
import traceback
|
||||
#from modules.monit.models.monit import LonelyIpField
|
||||
from modules.pastafari2.libraries.configtask import config_task
|
||||
|
||||
rq_server=True
|
||||
|
||||
if hasattr(config, 'rq_server'):
|
||||
rq_server=config.rq_server
|
||||
|
||||
class LonelyIpField(IpField):
|
||||
|
||||
def __init__(self, name, size=64):
|
||||
|
|
@ -144,7 +150,13 @@ class Task(WebModel):
|
|||
"""
|
||||
|
||||
#return self.send_task(task_id, yes_parent, where_sql_server)
|
||||
return self.send_task_to_server(task_id, yes_parent, where_sql_server)
|
||||
if not rq_server:
|
||||
|
||||
return self.send_task_to_server(task_id, yes_parent, where_sql_server)
|
||||
|
||||
else:
|
||||
|
||||
return self.send_task(task_id, yes_parent, where_sql_server)
|
||||
|
||||
"""
|
||||
q = Queue(connection=Redis(host=redis_host, port=redis_port, password=redis_password))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue