@@ -4,13 +4,10 @@ |
||
| 4 | 4 | use Ackintosh\Snidel\Config; |
| 5 | 5 | use Ackintosh\Snidel\Fork\Fork; |
| 6 | 6 | use Ackintosh\Snidel\Pcntl; |
| 7 | -use Ackintosh\Snidel\Task\Queue as TaskQueue; |
|
| 8 | 7 | use Ackintosh\Snidel\QueueFactory; |
| 9 | 8 | use Ackintosh\Snidel\Result\Result; |
| 10 | -use Ackintosh\Snidel\Result\Queue as ResultQueue; |
|
| 11 | 9 | use Ackintosh\Snidel\Result\Collection; |
| 12 | 10 | use Ackintosh\Snidel\Error; |
| 13 | -use Ackintosh\Snidel\Exception\SharedMemoryControlException; |
|
| 14 | 11 | use Ackintosh\Snidel\Worker; |
| 15 | 12 | use Ackintosh\Snidel\ActiveWorkerSet; |
| 16 | 13 | |
@@ -140,24 +140,24 @@ discard block |
||
| 140 | 140 | |
| 141 | 141 | if (getmypid() === $this->ownerPid) { |
| 142 | 142 | // owner |
| 143 | - $this->log->info('pid: ' . getmypid()); |
|
| 143 | + $this->log->info('pid: '.getmypid()); |
|
| 144 | 144 | |
| 145 | 145 | return $this->masterPid; |
| 146 | 146 | } else { |
| 147 | 147 | // master |
| 148 | 148 | $taskQueue = $this->queueFactory->createTaskQueue(); |
| 149 | 149 | $activeWorkerSet = new ActiveWorkerSet(); |
| 150 | - $this->log->info('pid: ' . $this->masterPid); |
|
| 150 | + $this->log->info('pid: '.$this->masterPid); |
|
| 151 | 151 | |
| 152 | 152 | $log = $this->log; |
| 153 | 153 | foreach ($this->signals as $sig) { |
| 154 | - $this->pcntl->signal($sig, function ($sig) use ($log, $activeWorkerSet) { |
|
| 155 | - $log->info('received signal: ' . $sig); |
|
| 154 | + $this->pcntl->signal($sig, function($sig) use ($log, $activeWorkerSet) { |
|
| 155 | + $log->info('received signal: '.$sig); |
|
| 156 | 156 | |
| 157 | 157 | if ($activeWorkerSet->count() === 0) { |
| 158 | 158 | $log->info('no worker is active.'); |
| 159 | 159 | } else { |
| 160 | - $log->info('------> sending signal to workers. signal: ' . $sig); |
|
| 160 | + $log->info('------> sending signal to workers. signal: '.$sig); |
|
| 161 | 161 | $activeWorkerSet->terminate($sig); |
| 162 | 162 | $log->info('<------ sent signal'); |
| 163 | 163 | } |
@@ -165,9 +165,9 @@ discard block |
||
| 165 | 165 | }); |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | - $concurrency = (int)$this->config->get('concurrency'); |
|
| 168 | + $concurrency = (int) $this->config->get('concurrency'); |
|
| 169 | 169 | while ($task = $taskQueue->dequeue()) { |
| 170 | - $this->log->info('dequeued task #' . $taskQueue->dequeuedCount()); |
|
| 170 | + $this->log->info('dequeued task #'.$taskQueue->dequeuedCount()); |
|
| 171 | 171 | if ($activeWorkerSet->count() >= $concurrency) { |
| 172 | 172 | $status = null; |
| 173 | 173 | $workerPid = $this->pcntl->waitpid(-1, $status); |
@@ -201,12 +201,12 @@ discard block |
||
| 201 | 201 | |
| 202 | 202 | if (getmypid() === $this->masterPid) { |
| 203 | 203 | // master |
| 204 | - $this->log->info('forked worker. pid: ' . $worker->getPid()); |
|
| 204 | + $this->log->info('forked worker. pid: '.$worker->getPid()); |
|
| 205 | 205 | return $worker; |
| 206 | 206 | } else { |
| 207 | 207 | // worker |
| 208 | 208 | // @codeCoverageIgnoreStart |
| 209 | - $this->log->info('has forked. pid: ' . getmypid()); |
|
| 209 | + $this->log->info('has forked. pid: '.getmypid()); |
|
| 210 | 210 | |
| 211 | 211 | foreach ($this->signals as $sig) { |
| 212 | 212 | $this->pcntl->signal($sig, SIG_DFL, true); |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | $worker->setResultQueue($this->queueFactory->createResultQueue()); |
| 216 | 216 | |
| 217 | 217 | $resultHasQueued = false; |
| 218 | - register_shutdown_function(function () use (&$resultHasQueued, $worker) { |
|
| 218 | + register_shutdown_function(function() use (&$resultHasQueued, $worker) { |
|
| 219 | 219 | if (!$resultHasQueued) { |
| 220 | 220 | $worker->error(); |
| 221 | 221 | } |
@@ -252,13 +252,13 @@ discard block |
||
| 252 | 252 | */ |
| 253 | 253 | public function sendSignalToMaster($sig = SIGTERM) |
| 254 | 254 | { |
| 255 | - $this->log->info('----> sending signal to master. signal: ' . $sig); |
|
| 255 | + $this->log->info('----> sending signal to master. signal: '.$sig); |
|
| 256 | 256 | posix_kill($this->masterPid, $sig); |
| 257 | 257 | $this->log->info('<---- sent signal.'); |
| 258 | 258 | |
| 259 | 259 | $status = null; |
| 260 | 260 | $this->pcntl->waitpid($this->masterPid, $status); |
| 261 | - $this->log->info('. status: ' . $status); |
|
| 261 | + $this->log->info('. status: '.$status); |
|
| 262 | 262 | $this->masterPid = null; |
| 263 | 263 | } |
| 264 | 264 | |