@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | |
| 28 | 28 | public function addFileType($type) |
| 29 | 29 | { |
| 30 | - $type = '.' . trim($type, '.'); |
|
| 30 | + $type = '.'.trim($type, '.'); |
|
| 31 | 31 | $this->fileTypes[$type] = true; |
| 32 | 32 | } |
| 33 | 33 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | public function isExcluded($path) |
| 55 | 55 | { |
| 56 | 56 | foreach ($this->excludedDirs as $excludedDir) { |
| 57 | - if ($excludedDir === $path || strpos($path, $excludedDir . '/') === 0) { |
|
| 57 | + if ($excludedDir === $path || strpos($path, $excludedDir.'/') === 0) { |
|
| 58 | 58 | return true; |
| 59 | 59 | } |
| 60 | 60 | } |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | if ($file === '.' || $file === '..' || $this->isExcluded($file)) { |
| 89 | 89 | continue; |
| 90 | 90 | } |
| 91 | - $file = $path . DIRECTORY_SEPARATOR . $file; |
|
| 91 | + $file = $path.DIRECTORY_SEPARATOR.$file; |
|
| 92 | 92 | if (is_dir($file)) { |
| 93 | 93 | $this->_watch($file); |
| 94 | 94 | } |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | |
| 123 | 123 | public function start() |
| 124 | 124 | { |
| 125 | - Event::add($this->fd, function ($fp) { |
|
| 125 | + Event::add($this->fd, function($fp) { |
|
| 126 | 126 | $events = inotify_read($fp); |
| 127 | 127 | foreach ($events as $event) { |
| 128 | 128 | if ($event['mask'] == IN_IGNORED) { |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | continue; |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | - Timer::after(100, function () use ($event) { |
|
| 141 | + Timer::after(100, function() use ($event) { |
|
| 142 | 142 | call_user_func_array($this->watchHandler, [$event]); |
| 143 | 143 | $this->doing = false; |
| 144 | 144 | }); |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | if ($len > $this->chunkLimit) { |
| 38 | - for ($offset = 0, $limit = (int)(0.6 * $this->chunkLimit); $offset < $len; $offset += $limit) { |
|
| 38 | + for ($offset = 0, $limit = (int) (0.6 * $this->chunkLimit); $offset < $len; $offset += $limit) { |
|
| 39 | 39 | $chunk = substr($content, $offset, $limit); |
| 40 | 40 | $this->swooleResponse->write($chunk); |
| 41 | 41 | } |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | if ($deleteFile) { |
| 48 | 48 | $fp = fopen($path, 'rb'); |
| 49 | 49 | |
| 50 | - for ($offset = 0, $limit = (int)(0.99 * $this->chunkLimit); $offset < $size; $offset += $limit) { |
|
| 50 | + for ($offset = 0, $limit = (int) (0.99 * $this->chunkLimit); $offset < $size; $offset += $limit) { |
|
| 51 | 51 | fseek($fp, $offset, SEEK_SET); |
| 52 | 52 | $chunk = fread($fp, $limit); |
| 53 | 53 | $this->swooleResponse->write($chunk); |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | $server[$headerServerMapping[$key]] = $value; |
| 51 | 51 | } else { |
| 52 | 52 | $key = str_replace('-', '_', $key); |
| 53 | - $server['http_' . $key] = $value; |
|
| 53 | + $server['http_'.$key] = $value; |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | $server = array_change_key_case($server, CASE_UPPER); |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | && isset($_SERVER['QUERY_STRING']) |
| 65 | 65 | && strlen($_SERVER['QUERY_STRING']) > 0 |
| 66 | 66 | ) { |
| 67 | - $_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING']; |
|
| 67 | + $_SERVER['REQUEST_URI'] .= '?'.$_SERVER['QUERY_STRING']; |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | // Fix argv & argc |
@@ -19,17 +19,17 @@ |
||
| 19 | 19 | return false; |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | - $fileTypes = isset($config['file_types']) ? (array)$config['file_types'] : []; |
|
| 22 | + $fileTypes = isset($config['file_types']) ? (array) $config['file_types'] : []; |
|
| 23 | 23 | if (empty($fileTypes)) { |
| 24 | 24 | $this->warning('No file types to watch by inotify'); |
| 25 | 25 | return false; |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | - $callback = function () use ($config, $laravelConf) { |
|
| 28 | + $callback = function() use ($config, $laravelConf) { |
|
| 29 | 29 | $log = !empty($config['log']); |
| 30 | 30 | $this->setProcessTitle(sprintf('%s laravels: inotify process', $config['process_prefix'])); |
| 31 | 31 | $inotify = new Inotify($config['watch_path'], IN_CREATE | IN_DELETE | IN_MODIFY | IN_MOVE, |
| 32 | - function ($event) use ($log, $laravelConf) { |
|
| 32 | + function($event) use ($log, $laravelConf) { |
|
| 33 | 33 | $reloadCmd = trim(sprintf('%s -c "%s" %s/bin/laravels reload', PHP_BINARY, php_ini_loaded_file(), $laravelConf['root_path'])); |
| 34 | 34 | Portal::runCommand($reloadCmd); |
| 35 | 35 | if ($log) { |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | if ($delay < 0) { |
| 29 | 29 | throw new \InvalidArgumentException('The delay must be greater than or equal to 0'); |
| 30 | 30 | } |
| 31 | - $this->delay = (int)$delay; |
|
| 31 | + $this->delay = (int) $delay; |
|
| 32 | 32 | return $this; |
| 33 | 33 | } |
| 34 | 34 | |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | if ($tries < 1) { |
| 52 | 52 | throw new \InvalidArgumentException('The number of attempts must be greater than or equal to 1'); |
| 53 | 53 | } |
| 54 | - $this->tries = (int)$tries; |
|
| 54 | + $this->tries = (int) $tries; |
|
| 55 | 55 | return $this; |
| 56 | 56 | } |
| 57 | 57 | |
@@ -71,19 +71,19 @@ discard block |
||
| 71 | 71 | */ |
| 72 | 72 | protected function task($task) |
| 73 | 73 | { |
| 74 | - $deliver = function () use ($task) { |
|
| 74 | + $deliver = function() use ($task) { |
|
| 75 | 75 | /**@var \Swoole\Http\Server $swoole */ |
| 76 | 76 | $swoole = app('swoole'); |
| 77 | 77 | // The worker_id of timer process is -1 |
| 78 | 78 | if ($swoole->worker_id === -1 || $swoole->taskworker) { |
| 79 | - $taskWorkerNum = isset($swoole->setting['task_worker_num']) ? (int)$swoole->setting['task_worker_num'] : 0; |
|
| 79 | + $taskWorkerNum = isset($swoole->setting['task_worker_num']) ? (int) $swoole->setting['task_worker_num'] : 0; |
|
| 80 | 80 | if ($taskWorkerNum < 2) { |
| 81 | 81 | throw new \InvalidArgumentException('LaravelS: async task needs to set task_worker_num >= 2'); |
| 82 | 82 | } |
| 83 | 83 | $workerNum = isset($swoole->setting['worker_num']) ? $swoole->setting['worker_num'] : 0; |
| 84 | 84 | $totalNum = $workerNum + $taskWorkerNum; |
| 85 | 85 | |
| 86 | - $getAvailableId = function ($startId, $endId, $excludeId) { |
|
| 86 | + $getAvailableId = function($startId, $endId, $excludeId) { |
|
| 87 | 87 | $ids = range($startId, $endId); |
| 88 | 88 | $ids = array_flip($ids); |
| 89 | 89 | unset($ids[$excludeId]); |
@@ -76,13 +76,13 @@ |
||
| 76 | 76 | parent::bindWebSocketEvent(); |
| 77 | 77 | |
| 78 | 78 | if ($this->enableWebSocket) { |
| 79 | - $eventHandler = function ($method, array $params) { |
|
| 80 | - $this->callWithCatchException(function () use ($method, $params) { |
|
| 79 | + $eventHandler = function($method, array $params) { |
|
| 80 | + $this->callWithCatchException(function() use ($method, $params) { |
|
| 81 | 81 | call_user_func_array([$this->getWebSocketHandler(), $method], $params); |
| 82 | 82 | }); |
| 83 | 83 | }; |
| 84 | 84 | |
| 85 | - $this->swoole->on('Open', function (WebSocketServer $server, SwooleRequest $request) use ($eventHandler) { |
|
| 85 | + $this->swoole->on('Open', function(WebSocketServer $server, SwooleRequest $request) use ($eventHandler) { |
|
| 86 | 86 | // Start Laravel's lifetime, then support session ...middleware. |
| 87 | 87 | $laravelRequest = $this->convertRequest($this->laravel, $request); |
| 88 | 88 | $this->laravel->bindRequest($laravelRequest); |
@@ -19,8 +19,8 @@ discard block |
||
| 19 | 19 | // Add backup cron job. |
| 20 | 20 | $config['jobs'][] = BackupCronJob::class; |
| 21 | 21 | |
| 22 | - $callback = function (Process $process) use ($swoole, $config, $laravelConfig) { |
|
| 23 | - $pidfile = dirname($swoole->setting['pid_file']) . '/' . $this->timerPidFile; |
|
| 22 | + $callback = function(Process $process) use ($swoole, $config, $laravelConfig) { |
|
| 23 | + $pidfile = dirname($swoole->setting['pid_file']).'/'.$this->timerPidFile; |
|
| 24 | 24 | file_put_contents($pidfile, $process->pid); |
| 25 | 25 | $this->setProcessTitle(sprintf('%s laravels: timer process', $config['process_prefix'])); |
| 26 | 26 | $this->initLaravel($laravelConfig, $swoole); |
@@ -42,9 +42,9 @@ discard block |
||
| 42 | 42 | if (empty($job->interval())) { |
| 43 | 43 | throw new \InvalidArgumentException(sprintf('The interval of %s cannot be empty', get_class($job))); |
| 44 | 44 | } |
| 45 | - $runJob = function () use ($job) { |
|
| 46 | - $runCallback = function () use ($job) { |
|
| 47 | - $this->callWithCatchException(function () use ($job) { |
|
| 45 | + $runJob = function() use ($job) { |
|
| 46 | + $runCallback = function() use ($job) { |
|
| 47 | + $this->callWithCatchException(function() use ($job) { |
|
| 48 | 48 | $job->run(); |
| 49 | 49 | }); |
| 50 | 50 | }; |
@@ -59,13 +59,13 @@ discard block |
||
| 59 | 59 | } |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | - Process::signal(SIGUSR1, function ($signo) use ($config, $timerIds, $process) { |
|
| 62 | + Process::signal(SIGUSR1, function($signo) use ($config, $timerIds, $process) { |
|
| 63 | 63 | foreach ($timerIds as $timerId) { |
| 64 | 64 | if (Timer::exists($timerId)) { |
| 65 | 65 | Timer::clear($timerId); |
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | - Timer::after($config['max_wait_time'] * 1000, function () use ($process) { |
|
| 68 | + Timer::after($config['max_wait_time'] * 1000, function() use ($process) { |
|
| 69 | 69 | $process->exit(0); |
| 70 | 70 | }); |
| 71 | 71 | }); |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | public function addCustomProcesses(Server $swoole, $processPrefix, array $processes, array $laravelConfig) |
| 13 | 13 | { |
| 14 | - $pidfile = dirname($swoole->setting['pid_file']) . '/' . $this->customProcessPidFile; |
|
| 14 | + $pidfile = dirname($swoole->setting['pid_file']).'/'.$this->customProcessPidFile; |
|
| 15 | 15 | if (file_exists($pidfile)) { |
| 16 | 16 | unlink($pidfile); |
| 17 | 17 | } |
@@ -29,9 +29,9 @@ discard block |
||
| 29 | 29 | continue; |
| 30 | 30 | } |
| 31 | 31 | $processClass = $item['class']; |
| 32 | - $restartInterval = isset($item['restart_interval']) ? (int)$item['restart_interval'] : 5; |
|
| 33 | - $callback = function (Process $worker) use ($pidfile, $swoole, $processPrefix, $processClass, $restartInterval, $name, $laravelConfig) { |
|
| 34 | - file_put_contents($pidfile, $worker->pid . "\n", FILE_APPEND | LOCK_EX); |
|
| 32 | + $restartInterval = isset($item['restart_interval']) ? (int) $item['restart_interval'] : 5; |
|
| 33 | + $callback = function(Process $worker) use ($pidfile, $swoole, $processPrefix, $processClass, $restartInterval, $name, $laravelConfig) { |
|
| 34 | + file_put_contents($pidfile, $worker->pid."\n", FILE_APPEND | LOCK_EX); |
|
| 35 | 35 | $this->initLaravel($laravelConfig, $swoole); |
| 36 | 36 | if (!isset(class_implements($processClass)[CustomProcessInterface::class])) { |
| 37 | 37 | throw new \InvalidArgumentException( |
@@ -45,13 +45,13 @@ discard block |
||
| 45 | 45 | /**@var CustomProcessInterface $processClass */ |
| 46 | 46 | $this->setProcessTitle(sprintf('%s laravels: %s process', $processPrefix, $name)); |
| 47 | 47 | |
| 48 | - Process::signal(SIGUSR1, function ($signo) use ($name, $processClass, $worker, $pidfile, $swoole) { |
|
| 48 | + Process::signal(SIGUSR1, function($signo) use ($name, $processClass, $worker, $pidfile, $swoole) { |
|
| 49 | 49 | $this->info(sprintf('Reloading %s process[PID=%d].', $name, $worker->pid)); |
| 50 | 50 | $processClass::onReload($swoole, $worker); |
| 51 | 51 | }); |
| 52 | 52 | |
| 53 | 53 | if (method_exists($processClass, 'onStop')) { |
| 54 | - Process::signal(SIGTERM, function ($signo) use ($name, $processClass, $worker, $pidfile, $swoole) { |
|
| 54 | + Process::signal(SIGTERM, function($signo) use ($name, $processClass, $worker, $pidfile, $swoole) { |
|
| 55 | 55 | $this->info(sprintf('Stopping %s process[PID=%d].', $name, $worker->pid)); |
| 56 | 56 | $processClass::onStop($swoole, $worker); |
| 57 | 57 | }); |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | |
| 60 | 60 | $coroutineAvailable = class_exists('Swoole\Coroutine'); |
| 61 | 61 | $coroutineRuntimeAvailable = class_exists('Swoole\Runtime'); |
| 62 | - $runProcess = function () use ($name, $processClass, $restartInterval, $swoole, $worker, $coroutineAvailable, $coroutineRuntimeAvailable) { |
|
| 62 | + $runProcess = function() use ($name, $processClass, $restartInterval, $swoole, $worker, $coroutineAvailable, $coroutineRuntimeAvailable) { |
|
| 63 | 63 | $coroutineRuntimeAvailable && \Swoole\Runtime::enableCoroutine(); |
| 64 | 64 | $this->callWithCatchException([$processClass, 'callback'], [$swoole, $worker]); |
| 65 | 65 | // Avoid frequent process creation |