summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-06-22 15:51:14 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-06-22 15:51:14 -0700
commitd14a5a3ec2a7127863c802b94c0cf6b865822b3c (patch)
tree0b65d057c284a89d60d68095963903cc2e283595
parent3cbdc684546544a2ba71ba36897b1ca24df92548 (diff)
pingqueuehandler uses commandline
-rw-r--r--scripts/pingqueuehandler.php40
1 files changed, 20 insertions, 20 deletions
diff --git a/scripts/pingqueuehandler.php b/scripts/pingqueuehandler.php
index 84ef9be27..1bde4bc5f 100644
--- a/scripts/pingqueuehandler.php
+++ b/scripts/pingqueuehandler.php
@@ -18,25 +18,22 @@
* 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);
-// Preset the server at the command line
+$shortoptions = 'i';
+$longoptions = array('id');
+
+$helptext = <<<END_OF_PING_HELP
+Daemon script for pushing new notices to ping servers.
-$server = ($argc > 2) ? $argv[2] : null;
-$path = ($argc > 3) ? $argv[3] : null;
+ -i --id Identity (default none)
-require_once(INSTALLDIR . '/lib/common.php');
-require_once(INSTALLDIR . '/lib/ping.php');
-require_once(INSTALLDIR . '/lib/queuehandler.php');
+END_OF_PING_HELP;
-set_error_handler('common_error_handler');
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+require_once INSTALLDIR . '/lib/ping.php';
+require_once INSTALLDIR . '/lib/queuehandler.php';
class PingQueueHandler extends QueueHandler {
@@ -57,12 +54,15 @@ class PingQueueHandler extends QueueHandler {
}
}
-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;
+if (have_option('-i')) {
+ $id = get_option_value('-i');
+} else if (have_option('--id')) {
+ $id = get_option_value('--id');
+} else if (count($args) > 0) {
+ $id = $args[0];
+} else {
+ $id = null;
+}
$handler = new PingQueueHandler($id);