Commit427d5e4

committed

[WebServerBundle] fixed server:start when already running

1 parent524fcb1 commit427d5e4Copy full SHA for 427d5e4

File tree

+17

-1

lines changed

+17

-1

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,12 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`100`	`100`
`101`	`101`	`try {`
`102`	`102`	`$server =newWebServer();`
	`103`	`+if ($server->isRunning($input->getOption('pidfile'))) {`
	`104`	`+$io->error(sprintf('The web server is already running (listening on %s).',$server->getAddress($input->getOption('pidfile'))));`
	`105`	`+`
	`106`	`+return1;`
	`107`	`+ }`
	`108`	`+`
`103`	`109`	`$config =newWebServerConfig($documentRoot,$env,$input->getArgument('addressport'),$input->getOption('router'));`
`104`	`110`
`105`	`111`	`if (WebServer::STARTED ===$server->start($config,$input->getOption('pidfile'))) {`

Lines changed: 1 addition & 1 deletion

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

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,16 @@ public function stop($pidFile = null)`
`109`	`109`	`unlink($pidFile);`
`110`	`110`	`}`
`111`	`111`
	`112`	`+publicfunctiongetAddress($pidFile =null)`
	`113`	`+ {`
	`114`	`+$pidFile =$pidFile ?:$this->getDefaultPidFile();`
	`115`	`+if (!file_exists($pidFile)) {`
	`116`	`+returnfalse;`
	`117`	`+ }`
	`118`	`+`
	`119`	`+returnfile_get_contents($pidFile);`
	`120`	`+ }`
	`121`	`+`
`112`	`122`	`publicfunctionisRunning($pidFile =null)`
`113`	`123`	`{`
`114`	`124`	`$pidFile =$pidFile ?:$this->getDefaultPidFile();`

Comments

(0)