tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-31 01:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve CLI web serving autodetection

Browse Source
This commit is contained in:
Thomas Gelf 2014-03-28 19:47:25 +00:00
parent 947ad34153
commit fba63602c9
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
application/clicommands/WebCommand.php
View File

@ -9,6 +9,15 @@ class WebCommand extends Command
{ {
public function serveAction() public function serveAction()
{ {
$minVersion = '5.4.0';
if (version_compare(PHP_VERSION, $minVersion) < 0) {
throw new Exception(sprintf(
'You are running PHP %s, internal webserver requires %s.',
PHP_VERSION,
$minVersion
));
}
$fork = $this->params->get('daemonize'); $fork = $this->params->get('daemonize');
$basedir = $this->params->shift(); $basedir = $this->params->shift();
$socket = $this->params->shift(); $socket = $this->params->shift();
@ -19,19 +28,25 @@ class WebCommand extends Command
// throw new Exception('Socket is required'); // throw new Exception('Socket is required');
} }
if ($basedir === null) { if ($basedir === null) {
throw new Exception('Basedir is required'); $basedir = dirname(ICINGA_APPDIR) . '/public';
if (! file_exists($basedir) || ! is_dir($basedir)) {
throw new Exception('Basedir is required');
}
} }
$basedir = realpath($basedir);
if ($fork) { if ($fork) {
$this->forkAndExit(); $this->forkAndExit();
} }
echo "Serving Icingaweb from $basedir\n";
$cmd = sprintf( $cmd = sprintf(
'%s -S %s -t %s %s', '%s -S %s -t %s %s',
readlink('/proc/self/exe'), readlink('/proc/self/exe'),
$socket, $socket,
$basedir, $basedir,
ICINGA_LIBDIR . '/Icinga/Application/webrouter.php' $basedir . '/index.php'
); );
// TODO: Store webserver log, switch uid, log index.php includes, pid file // TODO: Store webserver log, switch uid, log index.php includes, pid file
if ($fork) { if ($fork) {
exec($cmd); exec($cmd);