summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCiaranG <ciaran@ciarang.com>2009-04-28 13:30:54 +0100
committerCiaranG <ciaran@ciarang.com>2009-04-28 13:30:54 +0100
commit5b78f95e972f9f19ea46607e8b9544b8f7c4207a (patch)
tree7672a37a87654b90f46426aa8a7e747e5d268709
parent6a20ef71d3b2b325ce24318e2ba4483d6c8732ce (diff)
Only start daemons that are required, according to the site config. There is the potential to not start some more - see the checks in getvaliddaemons.php
-rwxr-xr-xscripts/getvaliddaemons.php52
-rwxr-xr-xscripts/startdaemons.sh6
2 files changed, 54 insertions, 4 deletions
diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
new file mode 100755
index 000000000..482e63af7
--- /dev/null
+++ b/scripts/getvaliddaemons.php
@@ -0,0 +1,52 @@
+#!/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/>.
+ */
+
+/**
+ * Utility script to get a list of daemons that should run, based on the
+ * current configuration. This is used by startdaemons.sh to determine what
+ * it should and shouldn't start up. The output is a list of space-separated
+ * 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";
+ exit();
+}
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('LACONICA', true);
+
+require_once(INSTALLDIR . '/lib/common.php');
+
+if(common_config('xmpp','enabled')) {
+ echo "xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php ";
+ echo "xmppconfirmhandler.php ";
+}
+if(common_config('memcached','enabled')) {
+ echo "memcachedqueuehandler.php ";
+}
+echo "ombqueuehandler.php ";
+echo "twitterqueuehandler.php ";
+echo "facebookqueuehandler.php ";
+echo "pingqueuehandler.php ";
+echo "inboxqueuehandler.php ";
+echo "smsqueuehandler.php ";
diff --git a/scripts/startdaemons.sh b/scripts/startdaemons.sh
index 66f9ed4e0..3869e95c4 100755
--- a/scripts/startdaemons.sh
+++ b/scripts/startdaemons.sh
@@ -21,11 +21,9 @@
# Note that the 'maildaemon' needs to run as a mail filter.
DIR=`dirname $0`
+DAEMONS=`php $DIR/getvaliddaemons.php`
-for f in xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php \
- xmppconfirmhandler.php smsqueuehandler.php ombqueuehandler.php \
- twitterqueuehandler.php facebookqueuehandler.php pingqueuehandler.php \
- memcachedqueuehandler.php inboxqueuehandler.php; do
+for f in $DAEMONS; do
echo -n "Starting $f...";
php $DIR/$f