diff options
author | Brion Vibber <brion@pobox.com> | 2010-04-06 15:22:23 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-04-06 15:22:23 -0700 |
commit | 5dc169260dc36209dd5ad0d4d4cac2bdaaefe62c (patch) | |
tree | c5fb50f7fbf6ff20b581c1ad5b50f2e19e6d7584 /plugins/Meteor | |
parent | a3314f483ec3250b322666a769a10197fb9dfff0 (diff) | |
parent | 4bb75d1c8e22b7bfc689a9e582ef846515a90383 (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/Meteor')
-rw-r--r-- | plugins/Meteor/MeteorPlugin.php | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php index 5b345d7c2..5600d5fcc 100644 --- a/plugins/Meteor/MeteorPlugin.php +++ b/plugins/Meteor/MeteorPlugin.php @@ -65,6 +65,26 @@ class MeteorPlugin extends RealtimePlugin parent::__construct(); } + /** + * Pull settings from config file/database if set. + */ + function initialize() + { + $settings = array('webserver', + 'webport', + 'controlport', + 'controlserver', + 'channelbase'); + foreach ($settings as $name) { + $val = common_config('meteor', $name); + if ($val !== false) { + $this->$name = $val; + } + } + + return parent::initialize(); + } + function _getScripts() { $scripts = parent::_getScripts(); |