always set up database_rw, regardless, so cached sessions work
This commit is contained in:
parent
d5f86f7a8a
commit
74a03cbe1f
20
index.php
20
index.php
|
@ -152,6 +152,16 @@ function checkMirror($action_obj, $args)
|
||||||
|
|
||||||
static $alwaysRW = array('session', 'remember_me');
|
static $alwaysRW = array('session', 'remember_me');
|
||||||
|
|
||||||
|
// We ensure that these tables always are used
|
||||||
|
// on the master DB
|
||||||
|
|
||||||
|
$config['db']['database_rw'] = $config['db']['database'];
|
||||||
|
$config['db']['ini_rw'] = INSTALLDIR.'/classes/statusnet.ini';
|
||||||
|
|
||||||
|
foreach ($alwaysRW as $table) {
|
||||||
|
$config['db']['table_'.$table] = 'rw';
|
||||||
|
}
|
||||||
|
|
||||||
if (common_config('db', 'mirror') && $action_obj->isReadOnly($args)) {
|
if (common_config('db', 'mirror') && $action_obj->isReadOnly($args)) {
|
||||||
if (is_array(common_config('db', 'mirror'))) {
|
if (is_array(common_config('db', 'mirror'))) {
|
||||||
// "load balancing", ha ha
|
// "load balancing", ha ha
|
||||||
|
@ -162,16 +172,6 @@ function checkMirror($action_obj, $args)
|
||||||
$mirror = common_config('db', 'mirror');
|
$mirror = common_config('db', 'mirror');
|
||||||
}
|
}
|
||||||
|
|
||||||
// We ensure that these tables always are used
|
|
||||||
// on the master DB
|
|
||||||
|
|
||||||
$config['db']['database_rw'] = $config['db']['database'];
|
|
||||||
$config['db']['ini_rw'] = INSTALLDIR.'/classes/statusnet.ini';
|
|
||||||
|
|
||||||
foreach ($alwaysRW as $table) {
|
|
||||||
$config['db']['table_'.$table] = 'rw';
|
|
||||||
}
|
|
||||||
|
|
||||||
// everyone else uses the mirror
|
// everyone else uses the mirror
|
||||||
|
|
||||||
$config['db']['database'] = $mirror;
|
$config['db']['database'] = $mirror;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user