8000 Web server bundle by fabpot · Pull Request #21039 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Web server bundle #21039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jan 6, 2017
Merged

Web server bundle #21039

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
132902c
moved server:* command to a new bundle
fabpot Dec 23, 2016
48dd2b0
removed obsolete check
fabpot Dec 23, 2016
ac1ba77
made the router configurable via env vars
fabpot Dec 23, 2016
951a1a2
[WebServerBundle] changed wording
fabpot Dec 24, 2016
fa7ebc5
[WebServerBundle] moved most of the logic in a new class
fabpot Dec 24, 2016
585d445
[WebServerBundle] tweaked command docs
fabpot Dec 30, 2016
6f689d6
[WebServerBundle] changed the way we keep track of the web server
fabpot Jan 4, 2017
126f4d9
[WebServerBundle] added support for port auto-detection
fabpot Jan 4, 2017
961d1ce
[WebServerBundle] fixed server:start when already running
fabpot Jan 5, 2017
f39b327
[WebServerBundle] switched auto-run of server:start to off by default
fabpot Jan 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[WebServerBundle] tweaked command docs
  • Loading branch information
@fabpot
fabpot committed Dec 30, 2016
commit 585d4451c87fb610cbc14c9fe83c462eedad503a
10 changes: 3 additions & 7 deletions src/Symfony/Bundle/WebServerBundle/Command/ServerRunCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,18 @@ protected function configure()

<info>%command.full_name%</info>

To change default bind address and port use the <info>address</info> argument:
Change the default address and port by passing them as an argument:

<info>%command.full_name% 127.0.0.1:8080</info>

To change default docroot directory use the <info>--docroot</info> option:
Use the <info>--docroot</info> option to change the default docroot directory:

<info>%command.full_name% --docroot=htdocs/</info>

If you have custom docroot directory layout, you can specify your own
router script using <info>--router</info> option:
Specify your own router script via the <info>--router</info> option:

<info>%command.full_name% --router=app/config/router.php</info>

Specifing a router script is required when the used environment is not "dev",
"prod", or "test".

See also: http://www.php.net/manual/en/features.commandline.webserver.php
EOF
)
Expand Down
10 changes: 3 additions & 7 deletions src/Symfony/Bundle/WebServerBundle/Command/ServerStartCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,18 @@ protected function configure()

<info>php %command.full_name%</info>

To change the default bind address and 8000 the default port use the <info>address</info> argument:
Change the default address and port by passing them as an argument:

<info>php %command.full_name% 127.0.0.1:8080</info>

To change the default document root directory use the <info>--docroot</info> option:
Use the <info>--docroot</info> option to change the default docroot directory:

<info>php %command.full_name% --docroot=htdocs/</info>

If you have a custom document root directory layout, you can specify your own
router script using the <info>--router</info> option:
Specify your own router script via the <info>--router</info> option:

<info>php %command.full_name% --router=app/config/router.php</info>

Specifying a router script is required when the used environment is not <comment>"dev"</comment> or
<comment>"prod"</comment>.

See also: http://www.php.net/manual/en/features.commandline.webserver.php
EOF
)
Expand Down
7 changes: 3 additions & 4 deletions src/Symfony/Bundle/WebServerBundle/WebServer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,13 @@ public function start($router = null)
$process->disableOutput();
$process->start();

$lockFile = $this->getLockFile();
touch($lockFile);

if (!$process->isRunning()) {
unlink($lockFile);
throw new \RuntimeException('Unable to start the server process.');
}

$lockFile = $this->getLockFile();
touch($lockFile);

// stop the web server when the lock file is removed
while ($process->isRunning()) {
if (!file_exists($lockFile)) {
Expand Down
0