714d920fae
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
classes/statusnet.ini
db/statusnet.sql
lib/jabber.php
lib/xmppmanager.php
2010-03-08 17:22:23 -05:00
086d517b87
Fix a few typos
2010-03-04 23:30:04 -05:00
f969d6349c
Merge branch 'testing' into 0.9.x
...
Conflicts:
db/08to09.sql
2010-03-04 10:16:59 -08:00
02f49193d5
adding checkschema to setup script
2010-03-04 11:49:19 -05:00
3c4ead4996
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
db/08to09.sql
locale/statusnet.po
scripts/update_po_templates.php
2010-03-01 14:59:26 -08:00
00f724d0e6
Localization tweak: include doc comments marked as 'TRANS' in .po file output; these should now get automatically pulled through to the TranslateWiki interface as translator help hints.
2010-03-01 14:10:13 -08:00
87c17bc0f0
Also extract _m() used in core.
...
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-01 15:47:43 +01:00
9b366547d7
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-26 12:33:50 -08:00
6781f95c73
Merge branch 'blacklistplus' into testing
...
Conflicts:
EVENTS.txt
2010-02-26 12:40:30 -05:00
8dfc8f1635
Merge branch 'testing' into 0.9.x
2010-02-26 09:35:28 -08:00
200a32b922
don't choke on dupelimit in createsim.php
2010-02-26 12:19:33 -05:00
c8ddcbe0d3
init_conversation.php script to copy old notice conversations into the conversation table
2010-02-25 17:56:01 -08:00
4a71753f20
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-02-25 09:28:19 -08:00
99c0e16844
Merge commit 'refs/merge-requests/121' of git://gitorious.org/statusnet/mainline into integration
2010-02-25 09:12:45 -08:00
66373f8e5a
Merge commit 'refs/merge-requests/2220' of git://gitorious.org/statusnet/mainline into integration
2010-02-25 09:11:07 -08:00
c187bf5597
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
EVENTS.txt
db/statusnet.sql
lib/queuemanager.php
2010-02-24 20:52:45 -05:00
8914b69d50
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-24 16:35:57 -08:00
3b7084c6dd
Fix update_po_templates.php to support the plural and context variants of _m() in plugins
2010-02-24 16:34:45 -08:00
85528ccb1f
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-21 11:12:56 -08:00
e717cba19c
Add Script To Update Group Avatar URLs
...
Similar to scripts/updateavatarurl.php.
Works for groups.
Again, I had to do some weird thing because using clone screwed up the find() iteration.
2010-02-18 13:44:16 -05:00
ddef800ec9
Update Avatar URL Did Weird Stuff.
...
It was only finding the first two avatars and then thinking it was done.
I'm not entirely sure why it was doing that.
I think maybe all the cloning made it forget where it was or something.
Either way, it seems to work now, and really uses less memory.
2010-02-18 12:14:34 -05:00
07f145049e
Merge branch 'master' into testing
2010-02-17 16:52:13 -08:00
ce6be4f836
Queues: redid the breakout control model so we can start up and subscribe to queues without running through the complete site list, which is ok at 1k sites but too slow at 10k.
...
All breakout queues that we're going to need to listen to now need to be explicitly listed in $config['queue']['breakout'].
Until XMPP is moved to component model, this setting will let the individual processes work with their own queues:
$config['queue']['breakout'][] = 'xmpp/xmppout/' . $config['site']['nickname'];
2010-02-17 16:49:00 -08:00
20d6a7caed
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
lib/queuemanager.php
lib/xmppmanager.php
plugins/Xmpp/Fake_XMPP.php
scripts/imdaemon.php
2010-02-16 13:15:09 -05:00
d5cbfe8071
Merge branch 'testing' into 0.9.x
...
Conflicts:
lib/iomaster.php
2010-02-16 09:25:09 -08:00
81b6b58e33
Merge branch 'master' into testing
...
Conflicts:
lib/stompqueuemanager.php
2010-02-16 09:22:02 -08:00
c74aea589d
Stomp queue restructuring for mass scalability:
...
- Multiplexing queues into groups and for multiple sites.
- Sharing vs breakout configurable per site and per queue via $config['queue']['breakout']
- Detect how many times a message is redelivered, discard if it's killed too many daemons
- count configurable with $config['queue']['max_retries']
- can dump the items to files in $config['queue']['dead_letter_dir']
Queue daemon memory & resource leak fixes:
- avoid unnecessary reconnections to memcached server (switch persistent connections back in on second initialization, assuming it's child process)
- monkey-patch for leaky .ini loads in DB_DataObject::databaseStructure() - was leaking 200k per active switch
- applied leak fixes to Status_network as well, using intermediate base Safe_DataObject for both it and Memcache_DataObject
Misc queue fixes:
- correct handling of child processes exiting due to signal termination instead of regular exit
- shutdown instead of infinite respawn loop if we're already past the soft memory limit at startup
- Added --all option for xmppdaemon... still opens one xmpp connection per site that has xmpp active
Cache updates:
- add Cache::increment() method with native support for memcached atomic increment
2010-02-16 09:16:51 -08:00
32084e33a2
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
lib/queuemanager.php
2010-02-16 10:25:57 -05:00
b2e8d8407c
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-02-08 15:48:52 -08:00
4e6f587f86
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-02-08 15:47:55 -08:00
96ef4435b6
Allow scripts/decache.php to blow out cache for objects that don't exist (anymore).
...
May miss keys other than the given or primary key, but should work for a lot of common cases where a bad entry's been removed from DB but lingers in cache.
2010-02-08 15:32:20 -08:00
c59eee72a8
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-04 12:23:56 -08:00
a020e23086
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-02-04 11:56:07 -08:00
7a7e2162dd
Script to update profile URLs
2010-02-03 14:58:29 -05:00
0e0beea5aa
clearcache.php column flag was conflicting with default flag
2010-02-03 12:13:20 -05:00
aee73d87ee
showcache.php column flag was conflicting with default flag
2010-02-03 12:13:07 -05:00
644a916383
change 'sitetype' to 'siteplan' to use consistent language
2010-02-03 11:55:54 -05:00
057ec1fcea
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
EVENTS.txt
lib/imqueuehandler.php
lib/jabber.php
lib/util.php
plugins/Xmpp/Sharing_XMPP.php
2010-02-02 17:00:10 -05:00
f4c81fa1e1
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-02-02 09:57:50 -08:00
5f14301c55
setconfig.php: list all current settings if no parameters given
2010-02-02 06:15:01 -08:00
4f6052d8d8
Apply xopher's fix to add 'sitetype' parameter to setup_status_network.sh, exposed to the email
2010-02-02 05:53:05 -08:00
c14ac57b19
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-02-01 10:30:45 -08:00
5d2c083899
Add a script to clear the cache for a given key
...
Like showcache.php, clearcache.php clears the cache for a given key.
2010-01-31 22:58:29 -05:00
779204b194
Merge branch 'testing' into 0.9.x
...
Conflicts:
actions/apioauthauthorize.php
2010-01-31 15:27:58 -05:00
2a054a50fb
live fast, die young in bash scripts
2010-01-29 15:33:35 -05:00
288dc3452f
Log exceptions from queuedaemon.php if they're not already caught
2010-01-28 22:05:14 -08:00
864ce8e276
Fixes for status_network db object .ini and tag setter script
2010-01-28 20:09:17 -08:00
4a0413c027
Add a script to set tags for sites
2010-01-28 20:00:33 -08:00
914bc9f9c5
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
lib/queuemanager.php
2010-01-27 22:07:04 -05:00
fe531dfc6c
Shuffle params on setup_status_network; adding fullname and pushing tags up
2010-01-27 16:03:51 -08:00
Craig Andrews
Rasmus Lerdorf
Brion Vibber
James Walker
Siebrand Mazeland
Evan Prodromou
Christopher Vollick