A working stopdaemons.sh, and no parameter needed for startdaemons.sh

darcs-hash:20080906202242-f6e2c-8f3d04c181ef4bffc1727f3333a3bfe5766bda6b.gz
This commit is contained in:
CiaranG 2008-09-06 16:22:42 -04:00
parent a1434ee1cf
commit e52be4183d
3 changed files with 76 additions and 2 deletions

32
scripts/getpiddir.php Executable file
View File

@ -0,0 +1,32 @@
#!/usr/bin/env php
<?php
/*
* Laconica - a distributed open-source microblogging tool
* Copyright (C) 2008, Controlez-Vous, 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');
echo common_config('daemon','piddir');

View File

@ -20,12 +20,12 @@
# This program tries to start the daemons for Laconica. # This program tries to start the daemons for Laconica.
# Note that the 'maildaemon' needs to run as a mail filter. # Note that the 'maildaemon' needs to run as a mail filter.
export INSTALLDIR=$1 DIR=`dirname $0`
for f in xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php \ for f in xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php \
xmppconfirmhandler.php smsqueuehandler.php ombqueuehandler.php; do xmppconfirmhandler.php smsqueuehandler.php ombqueuehandler.php; do
echo -n "Starting $f..."; echo -n "Starting $f...";
php $INSTALLDIR/scripts/$f; php $DIR/$f
echo "DONE." echo "DONE."
done done

42
scripts/stopdaemons.sh Executable file
View File

@ -0,0 +1,42 @@
#!/bin/sh
# Laconica - a distributed open-source microblogging tool
# Copyright (C) 2008, Controlez-Vous, 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/>.
# This program tries to stop the daemons for Laconica that were
# previously started by startdaemons.sh
DIR=`php getpiddir.php`
for f in jabberhandler ombhandler publichandler smshandler \
xmppconfirmhandler xmppdaemon; do
FILES="$DIR/$f.*.pid"
for ff in "$FILES" ; do
echo -n "Stopping $f..."
PID=`cat $ff`
kill -3 $PID
if kill -9 $PID ; then
echo "DONE."
else
echo "FAILED."
fi
rm -f $ff
done
done