[WebServerBundle] fixed server:start when already running

fabpot · fabpot · commit 961d1cea558e · 2017-01-05T11:49:47.000-08:00
diff --git a/src/Symfony/Bundle/WebServerBundle/Command/ServerStartCommand.php b/src/Symfony/Bundle/WebServerBundle/Command/ServerStartCommand.php
@@ -100,6 +100,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         try {
             $server = new WebServer();
+            if ($server->isRunning($input->getOption('pidfile'))) {
+                $io->error(sprintf('The web server is already running (listening on http://%s).', $server->getAddress($input->getOption('pidfile'))));
+
+                return 1;
+            }
+
             $config = new WebServerConfig($documentRoot, $env, $input->getArgument('addressport'), $input->getOption('router'));
 
             if (WebServer::STARTED === $server->start($config, $input->getOption('pidfile'))) {
diff --git a/src/Symfony/Bundle/WebServerBundle/Command/ServerStatusCommand.php b/src/Symfony/Bundle/WebServerBundle/Command/ServerStatusCommand.php
@@ -47,7 +47,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $io = new SymfonyStyle($input, $output);
         $server = new WebServer();
         if ($server->isRunning($input->getOption('pidfile'))) {
-            $io->success('Web server still listening.');
+            $io->success(sprintf('Web server still listening on http://%s', $server->getAddress($input->getOption('pidfile'))));
         } else {
             $io->warning('No web server is listening.');
         }
diff --git a/src/Symfony/Bundle/WebServerBundle/WebServer.php b/src/Symfony/Bundle/WebServerBundle/WebServer.php
@@ -109,6 +109,16 @@ public function stop($pidFile = null)
         unlink($pidFile);
     }
 
+    public function getAddress($pidFile = null)
+    {
+        $pidFile = $pidFile ?: $this->getDefaultPidFile();
+        if (!file_exists($pidFile)) {
+            return false;
+        }
+
+        return file_get_contents($pidFile);
+    }
+
     public function isRunning($pidFile = null)
     {
         $pidFile = $pidFile ?: $this->getDefaultPidFile();

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`47`	`47`	`$io = new SymfonyStyle($input, $output);`
`48`	`48`	`$server = new WebServer();`
`49`	`49`	`if ($server->isRunning($input->getOption('pidfile'))) {`
`50`		`- $io->success('Web server still listening.');`
	`50`	`+ $io->success(sprintf('Web server still listening on http://%s', $server->getAddress($input->getOption('pidfile'))));`
`51`	`51`	`} else {`
`52`	`52`	`$io->warning('No web server is listening.');`
`53`	`53`	`}`