GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sarven Capadisli 2009-04-16 21:59:40 +00:00
commit 864c4066a6
5 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/twitterapi.php
View File

@ -418,7 +418,7 @@ class TwitterapiAction extends Action
function date_twitter($dt) function date_twitter($dt)
{ {
$t = strtotime($dt); $t = strtotime($dt);
return date("D M d G:i:s O Y", $t); return date("D M d H:i:s O Y", $t);
} }
// XXX: Candidate for a general utility method somewhere? // XXX: Candidate for a general utility method somewhere?

9
scripts/jabberqueuehandler.php
View File

@ -54,6 +54,13 @@ class JabberQueueHandler extends XmppQueueHandler
} }
} }
// Abort immediately if xmpp is not enabled, otherwise the daemon chews up
// lots of CPU trying to connect to unconfigured servers
if (common_config('xmpp','enabled')==false) {
print "Aborting daemon - xmpp is disabled\n";
exit();
}
ini_set("max_execution_time", "0"); ini_set("max_execution_time", "0");
ini_set("max_input_time", "0"); ini_set("max_input_time", "0");
set_time_limit(0); set_time_limit(0);
@ -63,4 +70,4 @@ $resource = ($argc > 1) ? $argv[1] : (common_config('xmpp','resource') . '-queue
$handler = new JabberQueueHandler($resource); $handler = new JabberQueueHandler($resource);
$handler->runOnce(); $handler->runOnce();

7
scripts/publicqueuehandler.php
View File

@ -52,6 +52,13 @@ class PublicQueueHandler extends XmppQueueHandler
} }
} }
// Abort immediately if xmpp is not enabled, otherwise the daemon chews up
// lots of CPU trying to connect to unconfigured servers
if (common_config('xmpp','enabled')==false) {
print "Aborting daemon - xmpp is disabled\n";
exit();
}
ini_set("max_execution_time", "0"); ini_set("max_execution_time", "0");
ini_set("max_input_time", "0"); ini_set("max_input_time", "0");
set_time_limit(0); set_time_limit(0);

7
scripts/xmppconfirmhandler.php
View File

@ -140,6 +140,13 @@ class XmppConfirmHandler extends XmppQueueHandler
} }
} }
// Abort immediately if xmpp is not enabled, otherwise the daemon chews up
// lots of CPU trying to connect to unconfigured servers
if (common_config('xmpp','enabled')==false) {
print "Aborting daemon - xmpp is disabled\n";
exit();
}
ini_set("max_execution_time", "0"); ini_set("max_execution_time", "0");
ini_set("max_input_time", "0"); ini_set("max_input_time", "0");
set_time_limit(0); set_time_limit(0);

7
scripts/xmppdaemon.php
View File

@ -321,6 +321,13 @@ class XMPPDaemon extends Daemon
} }
} }
// Abort immediately if xmpp is not enabled, otherwise the daemon chews up
// lots of CPU trying to connect to unconfigured servers
if (common_config('xmpp','enabled')==false) {
print "Aborting daemon - xmpp is disabled\n";
exit();
}
ini_set("max_execution_time", "0"); ini_set("max_execution_time", "0");
ini_set("max_input_time", "0"); ini_set("max_input_time", "0");
set_time_limit(0); set_time_limit(0);