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

Squashed commit of the following:

Browse Source 
commit cd43ac412c90722e3b83ec750d9232a2ac2f12c9
Merge: dad72cc adaf175
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 09:41:05 2012 -0400

    Merge commit 'refs/merge-requests/196' of git://gitorious.org/statusnet/mainline into merge-requests/196

commit adaf17552d3ab35d451c00cdb32d87a107e0e56a
Author: Jeremy Pope <jpope@jpope.org>
Date:   Thu Jul 5 12:33:06 2012 -0500

    fix for XMPP high CPU usage - issue no 3232

commit e573e8ee6690af94259ff8793a84652a139d0662
Author: Jeremy Pope <jpope@jpope.org>
Date:   Thu Jul 5 12:30:34 2012 -0500

    fix for queuedaemon and imdaemon not being stopped by stopdaemons.sh
This commit is contained in:
Evan Prodromou 2012-07-09 09:43:05 -04:00
parent dad72cce28
commit 78a8eb5b6e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/Xmpp/XmppPlugin.php
View File

@ -380,12 +380,12 @@ class XmppPlugin extends ImPlugin
if ($pl['type'] != 'chat') { if ($pl['type'] != 'chat') {
$this->log(LOG_WARNING, "Ignoring message of type ".$pl['type']." from $from: " . $pl['xml']->toString()); $this->log(LOG_WARNING, "Ignoring message of type ".$pl['type']." from $from: " . $pl['xml']->toString());
return; return true;
} }
if (mb_strlen($pl['body']) == 0) { if (mb_strlen($pl['body']) == 0) {
$this->log(LOG_WARNING, "Ignoring message with empty body from $from: " . $pl['xml']->toString()); $this->log(LOG_WARNING, "Ignoring message with empty body from $from: " . $pl['xml']->toString());
return; return true;
} }
$this->handleIncoming($from, $pl['body']); $this->handleIncoming($from, $pl['body']);

4
scripts/stopdaemons.sh
View File

@ -23,8 +23,8 @@
SDIR=`dirname $0` SDIR=`dirname $0`
DIR=`php $SDIR/getpiddir.php` DIR=`php $SDIR/getpiddir.php`
for f in ombhandler smshandler pinghandler \ for f in ombhandler smshandler pinghandler queuedaemon \
twitterhandler facebookhandler \ twitterhandler facebookhandler imdaemon \
twitterstatusfetcher synctwitterfriends pluginhandler rsscloudhandler; do twitterstatusfetcher synctwitterfriends pluginhandler rsscloudhandler; do
FILES="$DIR/$f.*.pid" FILES="$DIR/$f.*.pid"