From bbf4a6b599ce3a7d1b63e27e75745ec32a0285d8 Mon Sep 17 00:00:00 2001 From: Phil B Date: Wed, 11 Jun 2014 11:21:58 -0500 Subject: [PATCH 1/2] Update StartWorker command to set SYMFONY_ENV env var --- Command/StartWorkerCommand.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Command/StartWorkerCommand.php b/Command/StartWorkerCommand.php index 916c519..3e39f72 100644 --- a/Command/StartWorkerCommand.php +++ b/Command/StartWorkerCommand.php @@ -59,6 +59,10 @@ protected function execute(InputInterface $input, OutputInterface $output) if ($input->getOption('quiet')) { unset($env['VERBOSE']); } + + if ($input->getOption('env')) { + $env['SYMFONY_ENV'] = $input->getOption('env'); + } $redisHost = $this->getContainer()->getParameter('bcc_resque.resque.redis.host'); $redisPort = $this->getContainer()->getParameter('bcc_resque.resque.redis.port'); From 709d8715809203d27a79a9aceb0053827625a8bc Mon Sep 17 00:00:00 2001 From: Phil B Date: Wed, 11 Jun 2014 11:23:15 -0500 Subject: [PATCH 2/2] Update ContainerAwareJob to check SYMFONY_ENV var when setting environment --- ContainerAwareJob.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ContainerAwareJob.php b/ContainerAwareJob.php index a769720..9ffefed 100644 --- a/ContainerAwareJob.php +++ b/ContainerAwareJob.php @@ -44,8 +44,15 @@ protected function createKernel() require_once $file; + $env = 'dev'; + if (isset($this->args['kernel.environment'])) { + $env = $this->args['kernel.environment']; + } elseif (getenv('SYMFONY_ENV')) { + $env = getenv('SYMFONY_ENV'); + } + return new $class( - isset($this->args['kernel.environment']) ? $this->args['kernel.environment'] : 'dev', + $env, isset($this->args['kernel.debug']) ? $this->args['kernel.debug'] : true ); }