From bb874b62b7c8ea80b89a6aa6ab2261dcda0938a9 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 12 Oct 2011 16:15:55 -0400 Subject: [PATCH 1/3] add a \n for japanese email --- locale/ja/LC_MESSAGES/statusnet.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 6359e1c7b6..686ee65d72 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -7980,7 +7980,7 @@ msgstr "" "もしそうでなければ、このメッセージを無視してください。\n" "\n" "あなたの時間をありがとうございます。\n" -"%2$s" +"%2$s\n" #. TRANS: Subject of new-subscriber notification e-mail. #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename. From e78d84556e07ea334965101dbad4b1a12f9364e4 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 12 Oct 2011 17:03:43 -0400 Subject: [PATCH 2/3] more robust handling of bad data in offline backup queue handler --- .../offlinebackupqueuehandler.php | 89 ++++++++++++------- 1 file changed, 56 insertions(+), 33 deletions(-) diff --git a/plugins/OfflineBackup/offlinebackupqueuehandler.php b/plugins/OfflineBackup/offlinebackupqueuehandler.php index 054c4d403c..2de6c9a667 100644 --- a/plugins/OfflineBackup/offlinebackupqueuehandler.php +++ b/plugins/OfflineBackup/offlinebackupqueuehandler.php @@ -126,11 +126,16 @@ class OfflineBackupQueueHandler extends QueueHandler $notice = $stream->getNotices(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); while ($notice->fetch()) { - $fname = $dir . '/'. common_date_iso8601($notice->created) . '-notice-' . $notice->id . '.atom'; - $data = $notice->asAtomEntry(false, false, false, null); - common_log(LOG_INFO, 'dumping notice ' . $notice->id . ' to file ' . $fname); - file_put_contents($fname, $data); - $data = null; + try { + $fname = $dir . '/'. common_date_iso8601($notice->created) . '-notice-' . $notice->id . '.atom'; + $data = $notice->asAtomEntry(false, false, false, null); + common_log(LOG_INFO, 'dumping notice ' . $notice->id . ' to file ' . $fname); + file_put_contents($fname, $data); + $data = null; + } catch (Exception $e) { + common_log(LOG_ERR, "Error backing up notice " . $notice->id . ": " . $e->getMessage()); + continue; + } } $page++; @@ -148,12 +153,17 @@ class OfflineBackupQueueHandler extends QueueHandler $fave = Fave::byProfile($user->id, ($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); while ($fave->fetch()) { - $fname = $dir . '/'. common_date_iso8601($fave->modified) . '-fave-' . $fave->notice_id . '.atom'; - $act = $fave->asActivity(); - $data = $act->asString(false, false, false); - common_log(LOG_INFO, 'dumping fave of ' . $fave->notice_id . ' to file ' . $fname); - file_put_contents($fname, $data); - $data = null; + try { + $fname = $dir . '/'. common_date_iso8601($fave->modified) . '-fave-' . $fave->notice_id . '.atom'; + $act = $fave->asActivity(); + $data = $act->asString(false, false, false); + common_log(LOG_INFO, 'dumping fave of ' . $fave->notice_id . ' to file ' . $fname); + file_put_contents($fname, $data); + $data = null; + } catch (Exception $e) { + common_log(LOG_ERR, "Error backing up fave of " . $fave->notice_id . ": " . $e->getMessage()); + continue; + } } $page++; @@ -171,15 +181,20 @@ class OfflineBackupQueueHandler extends QueueHandler $sub = Subscription::bySubscriber($user->id, ($page-1)*PROFILES_PER_PAGE, PROFILES_PER_PAGE + 1); while ($sub->fetch()) { - if ($sub->subscribed == $user->id) { + try { + if ($sub->subscribed == $user->id) { + continue; + } + $fname = $dir . '/'. common_date_iso8601($sub->created) . '-subscription-' . $sub->subscribed . '.atom'; + $act = $sub->asActivity(); + $data = $act->asString(false, false, false); + common_log(LOG_INFO, 'dumping sub of ' . $sub->subscribed . ' to file ' . $fname); + file_put_contents($fname, $data); + $data = null; + } catch (Exception $e) { + common_log(LOG_ERR, "Error backing up subscription to " . $sub->subscribed . ": " . $e->getMessage()); continue; } - $fname = $dir . '/'. common_date_iso8601($sub->created) . '-subscription-' . $sub->subscribed . '.atom'; - $act = $sub->asActivity(); - $data = $act->asString(false, false, false); - common_log(LOG_INFO, 'dumping sub of ' . $sub->subscribed . ' to file ' . $fname); - file_put_contents($fname, $data); - $data = null; } $page++; @@ -197,15 +212,20 @@ class OfflineBackupQueueHandler extends QueueHandler $sub = Subscription::bySubscribed($user->id, ($page-1)*PROFILES_PER_PAGE, PROFILES_PER_PAGE + 1); while ($sub->fetch()) { - if ($sub->subscriber == $user->id) { + try { + if ($sub->subscriber == $user->id) { + continue; + } + $fname = $dir . '/'. common_date_iso8601($sub->created) . '-subscriber-' . $sub->subscriber . '.atom'; + $act = $sub->asActivity(); + $data = $act->asString(false, true, false); + common_log(LOG_INFO, 'dumping sub by ' . $sub->subscriber . ' to file ' . $fname); + file_put_contents($fname, $data); + $data = null; + } catch (Exception $e) { + common_log(LOG_ERR, "Error backing up subscription from " . $sub->subscriber . ": " . $e->getMessage()); continue; } - $fname = $dir . '/'. common_date_iso8601($sub->created) . '-subscriber-' . $sub->subscriber . '.atom'; - $act = $sub->asActivity(); - $data = $act->asString(false, true, false); - common_log(LOG_INFO, 'dumping sub by ' . $sub->subscriber . ' to file ' . $fname); - file_put_contents($fname, $data); - $data = null; } $page++; @@ -224,18 +244,21 @@ class OfflineBackupQueueHandler extends QueueHandler $mem = Group_member::byMember($user->id, ($page-1)*GROUPS_PER_PAGE, GROUPS_PER_PAGE + 1); while ($mem->fetch()) { - $fname = $dir . '/'. common_date_iso8601($mem->created) . '-membership-' . $mem->group_id . '.atom'; - $act = $mem->asActivity(); - $data = $act->asString(false, false, false); - common_log(LOG_INFO, 'dumping membership in ' . $mem->group_id . ' to file ' . $fname); - file_put_contents($fname, $data); - $data = null; + try { + $fname = $dir . '/'. common_date_iso8601($mem->created) . '-membership-' . $mem->group_id . '.atom'; + $act = $mem->asActivity(); + $data = $act->asString(false, false, false); + common_log(LOG_INFO, 'dumping membership in ' . $mem->group_id . ' to file ' . $fname); + file_put_contents($fname, $data); + $data = null; + } catch (Exception $e) { + common_log(LOG_ERR, "Error backing up membership in " . $mem->group_id . ": " . $e->getMessage()); + continue; + } } $page++; - common_debug("Got " . $mem->N . " results on search for groups."); - } while ($mem->N > GROUPS_PER_PAGE); } From b42cc773ed16e7cddf78a1525475329d430b1753 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 16 Oct 2011 04:44:08 -0400 Subject: [PATCH 3/3] Script to move a statusnetwork from one db server to another This script helps move a statusnetwork from one DB server to another. It's for use with multi-site installations (like status.net). --- scripts/move_status_network.sh | 102 +++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100755 scripts/move_status_network.sh diff --git a/scripts/move_status_network.sh b/scripts/move_status_network.sh new file mode 100755 index 0000000000..2a259c280a --- /dev/null +++ b/scripts/move_status_network.sh @@ -0,0 +1,102 @@ +#!/bin/bash + +# live fast! die young! + +set -e + +# move_status_network.sh nickname newserver + +export nickname="$1" +export newdbhost="$2" + +source /etc/statusnet/setup.cfg + +function set_maintenance_mode() +{ + local nickname=$1; + + php $PHPBASE/scripts/settag.php $nickname maintenancemode; +} + +function get_current_db_info() +{ + local nickname=$1; + + #FIXME I couldn't make this work better + + export dbhost=`mysql -NB -h $SITEDBHOSTNAME -u $ADMIN --password=$ADMINPASS -e "SELECT dbhost FROM status_network WHERE nickname = '$nickname'" $SITEDB` + export dbuser=`mysql -NB -h $SITEDBHOSTNAME -u $ADMIN --password=$ADMINPASS -e "SELECT dbuser FROM status_network WHERE nickname = '$nickname'" $SITEDB` + export dbpass=`mysql -NB -h $SITEDBHOSTNAME -u $ADMIN --password=$ADMINPASS -e "SELECT dbpass FROM status_network WHERE nickname = '$nickname'" $SITEDB` + export dbname=`mysql -NB -h $SITEDBHOSTNAME -u $ADMIN --password=$ADMINPASS -e "SELECT dbname FROM status_network WHERE nickname = '$nickname'" $SITEDB` +} + +function create_empty_db() +{ + local newdbhost=$1; + local dbuser=$2; + local dbpass=$3; + local dbname=$4; + + mysqladmin -h $newdbhost -u $ADMIN --password=$ADMINPASS create $dbname; + + mysql -h $newdbhost -u $ADMIN --password=$ADMINPASS -e "GRANT ALL ON $dbname.* TO '$dbuser'@'localhost' IDENTIFIED BY '$dbpass';" $dbname; + mysql -h $newdbhost -u $ADMIN --password=$ADMINPASS -e "GRANT ALL ON $dbname.* TO '$dbuser'@'%' IDENTIFIED BY '$dbpass';" $dbname; +} + +function transfer_data() +{ + local dbhost=$1; + local newdbhost=$2; + local dbuser=$3; + local dbpass=$4; + local dbname=$5; + local dumpfile=`mktemp`; + + mysqldump -h $dbhost -u $ADMIN --password=$ADMINPASS $dbname > $dumpfile; + mysql -h $newdbhost -u $ADMIN --password=$ADMINPASS $dbname < $dumpfile; + rm $dumpfile; +} + +function update_routing_table() +{ + local nickname=$1; + local newdbhost=$2; + + mysql -h $SITEDBHOSTNAME -u $ADMIN --password=$ADMINPASS -e "UPDATE status_network set dbhost = '$newdbhost' where nickname = '$nickname'" $SITEDB +} + +function flush_site() +{ + local nickname=$1; + + php $PHPBASE/scripts/flushsite.php -s$nickname.$WILDCARD +} + +function unset_maintenance_mode() +{ + local nickname=$1; + + php $PHPBASE/scripts/settag.php -d $nickname maintenancemode; +} + +echo -n Setting maintenance mode on $nickname... +set_maintenance_mode $nickname +echo DONE. +echo -n Getting current database info... +get_current_db_info $nickname +echo DONE. +echo -n Creating empty $dbname database on server $newdbhost... +create_empty_db $newdbhost $dbuser $dbpass $dbname +echo DONE +echo -n Copying $dbname database from $dbhost to $newdbhost... +transfer_data $dbhost $newdbhost $dbuser $dbpass $dbname +echo DONE +echo -n Updating the routing table for $nickname to use $dbname on $newdbhost... +update_routing_table $nickname $newdbhost +echo DONE +echo -n Flushing $nickname site from cache... +flush_site $nickname +echo DONE +echo -n Turning off maintenance mode on $nickname... +unset_maintenance_mode $nickname +echo DONE.