vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

[fix] [config] for new bench installs

Browse source
This commit is contained in:
Rushabh Mehta 2016-03-15 17:59:18 +05:30
parent 98a230a548
commit 01e585482f
4 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/__init__.py
View file

@ -190,7 +190,9 @@ def cache():
global redis_server
if not redis_server:
from frappe.utils.redis_wrapper import RedisWrapper
redis_server = RedisWrapper.from_url(conf.get("cache_redis_server") or "redis://localhost:11311")
redis_server = RedisWrapper.from_url(conf.get('redis_cache')
or conf.get("cache_redis_server")
or "redis://localhost:11311")
return redis_server
def get_traceback():

6
frappe/async.py
View file

@ -171,11 +171,13 @@ def put_log(line_no, line, task_id=None):
def get_redis_server():
"""Returns memcache connection."""
"""returns redis_socketio connection."""
global redis_server
if not redis_server:
from redis import Redis
redis_server = Redis.from_url(conf.get("async_redis_server") or "redis://localhost:12311")
redis_server = Redis.from_url(conf.get("redis_socketio")
or conf.get("async_redis_server")
or "redis://localhost:12311")
return redis_server

4
frappe/celery_app.py
View file

@ -32,8 +32,8 @@ def get_celery():
def get_celery_app():
conf = get_site_config()
app = Celery('frappe',
broker=conf.celery_broker or DEFAULT_CELERY_BROKER,
backend=conf.async_redis_server or DEFAULT_CELERY_BACKEND)
broker=conf.redis_queue or conf.celery_broker or DEFAULT_CELERY_BROKER,
backend=conf.redis_queue or conf.async_redis_server or DEFAULT_CELERY_BACKEND)
app.autodiscover_tasks(frappe.get_all_apps(with_internal_apps=False,
sites_path=SITES_PATH))

19
socketio.js
View file

@ -7,7 +7,7 @@ var redis = require("redis");
var request = require('superagent');
var conf = get_conf();
var subscriber = redis.createClient(conf.redis_async_broker_port);
var subscriber = redis.createClient(conf.redis_socketio || conf.redis_async_broker_port);
// serve socketio
http.listen(conf.socketio_port, function(){
@ -268,16 +268,21 @@ function get_conf() {
socketio_port: 3000
};
// get ports from bench/config.json
if(fs.existsSync('config.json')){
var bench_config = JSON.parse(fs.readFileSync('config.json'));
for (var key in conf) {
if (bench_config[key]) {
conf[key] = bench_config[key];
var read_config = function(path) {
if(fs.existsSync(path)){
var bench_config = JSON.parse(fs.readFileSync(path));
for (var key in conf) {
if (bench_config[key]) {
conf[key] = bench_config[key];
}
}
}
}
// get ports from bench/config.json
read_config('config.json');
read_config('sites/common_site_config.json');
// detect current site
if(fs.existsSync('sites/currentsite.txt')) {
conf.default_site = fs.readFileSync('sites/currentsite.txt').toString().trim();