summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/fixup_utf8.php355
-rwxr-xr-xscripts/getvaliddaemons.php2
-rwxr-xr-xscripts/inboxqueuehandler.php69
-rwxr-xr-xscripts/memcachedqueuehandler.php70
-rwxr-xr-xscripts/stopdaemons.sh3
5 files changed, 292 insertions, 207 deletions
diff --git a/scripts/fixup_utf8.php b/scripts/fixup_utf8.php
index e5021ff34..169376091 100644
--- a/scripts/fixup_utf8.php
+++ b/scripts/fixup_utf8.php
@@ -35,107 +35,334 @@ define('LACONICA', true);
require_once(INSTALLDIR . '/lib/common.php');
require_once('DB.php');
-function fixup_utf8($id) {
+class UTF8FixerUpper
+{
+ var $dbl = null;
+ var $dbu = null;
+ var $args = array();
+
+ function __construct($args)
+ {
+ $this->args = $args;
+
+ if (array_key_exists('max_date', $args)) {
+ $this->max_date = strftime('%Y-%m-%d %H:%M:%S', strtotime($args['max_date']));
+ } else {
+ $this->max_date = strftime('%Y-%m-%d %H:%M:%S', time());
+ }
- $dbl = doConnect('latin1');
+ $this->dbl = $this->doConnect('latin1');
- if (empty($dbl)) {
- return;
- }
+ if (empty($this->dbl)) {
+ return;
+ }
- $dbu = doConnect('utf8');
+ $this->dbu = $this->doConnect('utf8');
- if (empty($dbu)) {
- return;
+ if (empty($this->dbu)) {
+ return;
+ }
}
- // Do a separate DB connection
+ function doConnect($charset)
+ {
+ $db = DB::connect(common_config('db', 'database'),
+ array('persistent' => false));
- $sth = $dbu->prepare("UPDATE notice SET content = UNHEX(?), rendered = UNHEX(?) WHERE id = ?");
+ if (PEAR::isError($db)) {
+ echo "ERROR: " . $db->getMessage() . "\n";
+ return NULL;
+ }
- if (PEAR::isError($sth)) {
- echo "ERROR: " . $sth->getMessage() . "\n";
- return;
- }
+ $conn = $db->connection;
- $sql = 'SELECT id, content, rendered FROM notice ' .
- 'WHERE LENGTH(content) != CHAR_LENGTH(content)';
+ $succ = mysqli_set_charset($conn, $charset);
- if (!empty($id)) {
- $sql .= ' AND id < ' . $id;
- }
+ if (!$succ) {
+ echo "ERROR: couldn't set charset\n";
+ $db->disconnect();
+ return NULL;
+ }
- $sql .= ' ORDER BY id DESC';
+ $result = $db->autoCommit(true);
- $rn = $dbl->query($sql);
+ if (PEAR::isError($result)) {
+ echo "ERROR: " . $result->getMessage() . "\n";
+ $db->disconnect();
+ return NULL;
+ }
- if (PEAR::isError($rn)) {
- echo "ERROR: " . $rn->getMessage() . "\n";
- return;
+ return $db;
}
- echo "Number of rows: " . $rn->numRows() . "\n";
+ function fixup()
+ {
+ $this->fixupNotices($this->args['max_notice'],
+ $this->args['min_notice']);
+ $this->fixupProfiles();
+ $this->fixupGroups();
+ $this->fixupMessages();
+ }
- $notice = array();
+ function fixupNotices($max_id, $min_id) {
- while (DB_OK == $rn->fetchInto($notice)) {
+ // Do a separate DB connection
- $id = ($notice[0])+0;
- $content = bin2hex($notice[1]);
- $rendered = bin2hex($notice[2]);
+ $sth = $this->dbu->prepare("UPDATE notice SET content = UNHEX(?), rendered = UNHEX(?) WHERE id = ?");
- echo "$id...";
+ if (PEAR::isError($sth)) {
+ echo "ERROR: " . $sth->getMessage() . "\n";
+ return;
+ }
- $result =& $dbu->execute($sth, array($content, $rendered, $id));
+ $sql = 'SELECT id, content, rendered FROM notice ' .
+ 'WHERE LENGTH(content) != CHAR_LENGTH(content) '.
+ 'AND modified < "'.$this->max_date.'" ';
- if (PEAR::isError($result)) {
- echo "ERROR: " . $result->getMessage() . "\n";
- continue;
+ if (!empty($max_id)) {
+ $sql .= ' AND id <= ' . $max_id;
+ }
+
+ if (!empty($min_id)) {
+ $sql .= ' AND id >= ' . $min_id;
}
- $cnt = $dbu->affectedRows();
+ $sql .= ' ORDER BY id DESC';
- if ($cnt != 1) {
- echo "ERROR: 0 rows affected\n";
- continue;
+ $rn = $this->dbl->query($sql);
+
+ if (PEAR::isError($rn)) {
+ echo "ERROR: " . $rn->getMessage() . "\n";
+ return;
}
- $notice = Notice::staticGet('id', $id);
- $notice->decache();
+ echo "Number of rows: " . $rn->numRows() . "\n";
- echo "OK\n";
- }
-}
+ $notice = array();
-function doConnect($charset)
-{
- $db = DB::connect(common_config('db', 'database'),
- array('persistent' => false));
+ while (DB_OK == $rn->fetchInto($notice)) {
+
+ $id = ($notice[0])+0;
+ $content = bin2hex($notice[1]);
+ $rendered = bin2hex($notice[2]);
- if (PEAR::isError($db)) {
- echo "ERROR: " . $db->getMessage() . "\n";
- return NULL;
+ echo "$id...";
+
+ $result =& $this->dbu->execute($sth, array($content, $rendered, $id));
+
+ if (PEAR::isError($result)) {
+ echo "ERROR: " . $result->getMessage() . "\n";
+ continue;
+ }
+
+ $cnt = $this->dbu->affectedRows();
+
+ if ($cnt != 1) {
+ echo "ERROR: 0 rows affected\n";
+ continue;
+ }
+
+ $notice = Notice::staticGet('id', $id);
+ $notice->decache();
+ $notice->free();
+
+ echo "OK\n";
+ }
}
- $result = $db->query("SET NAMES $charset");
+ function fixupProfiles()
+ {
+ // Do a separate DB connection
+
+ $sth = $this->dbu->prepare("UPDATE profile SET ".
+ "fullname = UNHEX(?),".
+ "location = UNHEX(?), ".
+ "bio = UNHEX(?) ".
+ "WHERE id = ?");
+
+ if (PEAR::isError($sth)) {
+ echo "ERROR: " . $sth->getMessage() . "\n";
+ return;
+ }
+
+ $sql = 'SELECT id, fullname, location, bio FROM profile ' .
+ 'WHERE (LENGTH(fullname) != CHAR_LENGTH(fullname) '.
+ 'OR LENGTH(location) != CHAR_LENGTH(location) '.
+ 'OR LENGTH(bio) != CHAR_LENGTH(bio)) '.
+ 'AND modified < "'.$this->max_date.'" '.
+ ' ORDER BY modified DESC';
+
+ $rn = $this->dbl->query($sql);
+
+ if (PEAR::isError($rn)) {
+ echo "ERROR: " . $rn->getMessage() . "\n";
+ return;
+ }
+
+ echo "Number of rows: " . $rn->numRows() . "\n";
+
+ $profile = array();
+
+ while (DB_OK == $rn->fetchInto($profile)) {
+
+ $id = ($profile[0])+0;
+ $fullname = bin2hex($profile[1]);
+ $location = bin2hex($profile[2]);
+ $bio = bin2hex($profile[3]);
+
+ echo "$id...";
+
+ $result =& $this->dbu->execute($sth, array($fullname, $location, $bio, $id));
+
+ if (PEAR::isError($result)) {
+ echo "ERROR: " . $result->getMessage() . "\n";
+ continue;
+ }
+
+ $cnt = $this->dbu->affectedRows();
- if (PEAR::isError($result)) {
- echo "ERROR: " . $result->getMessage() . "\n";
- $db->disconnect();
- return NULL;
+ if ($cnt != 1) {
+ echo "ERROR: 0 rows affected\n";
+ continue;
+ }
+
+ $profile = Profile::staticGet('id', $id);
+ $profile->decache();
+ $profile->free();
+
+ echo "OK\n";
+ }
}
- $result = $db->autoCommit(true);
+ function fixupGroups()
+ {
+ // Do a separate DB connection
+
+ $sth = $this->dbu->prepare("UPDATE user_group SET ".
+ "fullname = UNHEX(?),".
+ "location = UNHEX(?), ".
+ "description = UNHEX(?) ".
+ "WHERE id = ?");
+
+ if (PEAR::isError($sth)) {
+ echo "ERROR: " . $sth->getMessage() . "\n";
+ return;
+ }
+
+ $sql = 'SELECT id, fullname, location, description FROM user_group ' .
+ 'WHERE LENGTH(fullname) != CHAR_LENGTH(fullname) '.
+ 'OR LENGTH(location) != CHAR_LENGTH(location) '.
+ 'OR LENGTH(description) != CHAR_LENGTH(description) ';
+ 'AND modified < "'.$this->max_date.'" '.
+ 'ORDER BY modified DESC';
+
+ $rn = $this->dbl->query($sql);
+
+ if (PEAR::isError($rn)) {
+ echo "ERROR: " . $rn->getMessage() . "\n";
+ return;
+ }
+
+ echo "Number of rows: " . $rn->numRows() . "\n";
- if (PEAR::isError($result)) {
- echo "ERROR: " . $result->getMessage() . "\n";
- $db->disconnect();
- return NULL;
+ $user_group = array();
+
+ while (DB_OK == $rn->fetchInto($user_group)) {
+
+ $id = ($user_group[0])+0;
+ $fullname = bin2hex($user_group[1]);
+ $location = bin2hex($user_group[2]);
+ $description = bin2hex($user_group[3]);
+
+ echo "$id...";
+
+ $result =& $this->dbu->execute($sth, array($fullname, $location, $description, $id));
+
+ if (PEAR::isError($result)) {
+ echo "ERROR: " . $result->getMessage() . "\n";
+ continue;
+ }
+
+ $cnt = $this->dbu->affectedRows();
+
+ if ($cnt != 1) {
+ echo "ERROR: 0 rows affected\n";
+ continue;
+ }
+
+ $user_group = User_group::staticGet('id', $id);
+ $user_group->decache();
+ $user_group->free();
+
+ echo "OK\n";
+ }
}
- return $db;
+ function fixupMessages() {
+
+ // Do a separate DB connection
+
+ $sth = $this->dbu->prepare("UPDATE message SET content = UNHEX(?), rendered = UNHEX(?) WHERE id = ?");
+
+ if (PEAR::isError($sth)) {
+ echo "ERROR: " . $sth->getMessage() . "\n";
+ return;
+ }
+
+ $sql = 'SELECT id, content, rendered FROM message ' .
+ 'WHERE LENGTH(content) != CHAR_LENGTH(content) '.
+ 'AND modified < "'.$this->max_date.'" '.
+ 'ORDER BY id DESC';
+
+ $rn = $this->dbl->query($sql);
+
+ if (PEAR::isError($rn)) {
+ echo "ERROR: " . $rn->getMessage() . "\n";
+ return;
+ }
+
+ echo "Number of rows: " . $rn->numRows() . "\n";
+
+ $message = array();
+
+ while (DB_OK == $rn->fetchInto($message)) {
+
+ $id = ($message[0])+0;
+ $content = bin2hex($message[1]);
+ $rendered = bin2hex($message[2]);
+
+ echo "$id...";
+
+ $result =& $this->dbu->execute($sth, array($content, $rendered, $id));
+
+ if (PEAR::isError($result)) {
+ echo "ERROR: " . $result->getMessage() . "\n";
+ continue;
+ }
+
+ $cnt = $this->dbu->affectedRows();
+
+ if ($cnt != 1) {
+ echo "ERROR: 0 rows affected\n";
+ continue;
+ }
+
+ $message = Message::staticGet('id', $id);
+ $message->decache();
+ $message->free();
+
+ echo "OK\n";
+ }
+ }
}
-$id = ($argc > 1) ? $argv[1] : null;
+$max_date = ($argc > 1) ? $argv[1] : null;
+$max_id = ($argc > 2) ? $argv[2] : null;
+$min_id = ($argc > 3) ? $argv[3] : null;
+
+$fixer = new UTF8FixerUpper(array('max_date' => $max_date,
+ 'max_notice' => $max_id,
+ 'min_notice' => $min_id));
+
+$fixer->fixup();
-fixup_utf8($id);
diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
index a10233e69..4e49f9bd4 100755
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@ -25,7 +25,6 @@
* daemon names.
*/
-
# Abort if called from a web server
if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
print "This script must be run from the command line\n";
@@ -51,5 +50,4 @@ echo "ombqueuehandler.php ";
echo "twitterqueuehandler.php ";
echo "facebookqueuehandler.php ";
echo "pingqueuehandler.php ";
-echo "inboxqueuehandler.php ";
echo "smsqueuehandler.php ";
diff --git a/scripts/inboxqueuehandler.php b/scripts/inboxqueuehandler.php
deleted file mode 100755
index 73d31e854..000000000
--- a/scripts/inboxqueuehandler.php
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008,2009 Control Yourself, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Abort if called from a web server
-
-if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
- print "This script must be run from the command line\n";
- exit();
-}
-
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('LACONICA', true);
-
-require_once(INSTALLDIR . '/lib/common.php');
-require_once(INSTALLDIR . '/lib/queuehandler.php');
-
-set_error_handler('common_error_handler');
-
-class InboxQueueHandler extends QueueHandler
-{
- function transport()
- {
- return 'inbox';
- }
-
- function start() {
- $this->log(LOG_INFO, "INITIALIZE");
- return true;
- }
-
- function handle_notice($notice)
- {
- $this->log(LOG_INFO, "Distributing notice to inboxes for $notice->id");
- $notice->addToInboxes();
- $notice->blowSubsCache();
- return true;
- }
-
- function finish() {
- }
-}
-
-ini_set("max_execution_time", "0");
-ini_set("max_input_time", "0");
-set_time_limit(0);
-mb_internal_encoding('UTF-8');
-
-$id = ($argc > 1) ? $argv[1] : null;
-
-$handler = new InboxQueueHandler($id);
-
-$handler->runOnce();
diff --git a/scripts/memcachedqueuehandler.php b/scripts/memcachedqueuehandler.php
deleted file mode 100755
index 185b781f7..000000000
--- a/scripts/memcachedqueuehandler.php
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008,2009 Control Yourself, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Abort if called from a web server
-
-if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
- print "This script must be run from the command line\n";
- exit();
-}
-
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('LACONICA', true);
-
-require_once(INSTALLDIR . '/lib/common.php');
-require_once(INSTALLDIR . '/lib/queuehandler.php');
-
-set_error_handler('common_error_handler');
-
-class MemcachedQueueHandler extends QueueHandler
-{
- function transport()
- {
- return 'memcache';
- }
-
- function start() {
- $this->log(LOG_INFO, "INITIALIZE");
- return true;
- }
-
- function handle_notice($notice)
- {
- // XXX: fork here
- $this->log(LOG_INFO, "Blowing memcached for $notice->id");
- $notice->blowCaches();
- return true;
- }
-
- function finish() {
- }
-
-}
-
-ini_set("max_execution_time", "0");
-ini_set("max_input_time", "0");
-set_time_limit(0);
-mb_internal_encoding('UTF-8');
-
-$id = ($argc > 1) ? $argv[1] : null;
-
-$handler = new MemcachedQueueHandler($id);
-
-$handler->runOnce();
diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index 764037e8f..2134b4ab0 100755
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -24,8 +24,7 @@ SDIR=`dirname $0`
DIR=`php $SDIR/getpiddir.php`
for f in jabberhandler ombhandler publichandler smshandler pinghandler \
- xmppconfirmhandler xmppdaemon twitterhandler facebookhandler \
- memcachehandler inboxhandler twitterstatusfetcher; do
+ xmppconfirmhandler xmppdaemon twitterhandler facebookhandler; do
FILES="$DIR/$f.*.pid"
for ff in "$FILES" ; do
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-07 06:24:26 +0000