We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit c7d6e5b0 authored by Sarven Capadisli's avatar Sarven Capadisli

Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

parents 6b064e40 5771f413
......@@ -150,6 +150,9 @@ $config['sphinx']['port'] = 3312;
#$config['memcached']['server'] = 'localhost';
#$config['memcached']['port'] = 11211;
# Enable bidirectional Twitter bridge
#$config['twitterbridge']['enabled'] = true;
#Twitter integration source attribute. Note: default is Laconica
#$config['integration']['source'] = 'Laconica';
......
......@@ -2357,6 +2357,8 @@ class DB_DataObject extends DB_DataObject_Overload
$t= explode(' ',microtime());
$_DB_DATAOBJECT['QUERYENDTIME'] = $time = $t[0]+$t[1];
do {
if ($_DB_driver == 'DB') {
$result = $DB->query($string);
......@@ -2374,8 +2376,19 @@ class DB_DataObject extends DB_DataObject_Overload
break;
}
}
// try to reconnect, at most 3 times
$again = false;
if (is_a($result, 'PEAR_Error')
AND $result->getCode() == DB_ERROR_NODBSELECTED
AND $cpt++<3) {
$DB->disconnect();
sleep(1);
$DB->connect($DB->dsn);
$again = true;
}
} while ($again);
if (is_a($result,'PEAR_Error')) {
if (!empty($_DB_DATAOBJECT['CONFIG']['debug'])) {
......
......@@ -143,6 +143,8 @@ $config =
array('piddir' => '/var/run',
'user' => false,
'group' => false),
'twitterbridge' =>
array('enabled' => false),
'integration' =>
array('source' => 'Laconica', # source attribute for Twitter
'taguri' => $_server.',2009'), # base for tag URIs
......
......@@ -44,6 +44,9 @@ if(common_config('xmpp','enabled')) {
if(common_config('memcached','enabled')) {
echo "memcachedqueuehandler.php ";
}
if(common_config('twitterbridge','enabled')) {
echo "twitterstatusfetcher.php ";
}
echo "ombqueuehandler.php ";
echo "twitterqueuehandler.php ";
echo "facebookqueuehandler.php ";
......
This diff is collapsed.
......@@ -25,7 +25,7 @@ DIR=`php $SDIR/getpiddir.php`
for f in jabberhandler ombhandler publichandler smshandler pinghandler \
xmppconfirmhandler xmppdaemon twitterhandler facebookhandler \
memcachehandler inboxhandler; do
memcachehandler inboxhandler twitterstatusfetcher; do
FILES="$DIR/$f.*.pid"
for ff in "$FILES" ; do
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment