@@ -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); |
@@ -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 |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | $ip = isset($conf['listen_ip']) ? $conf['listen_ip'] : '127.0.0.1'; |
| 43 | 43 | $port = isset($conf['listen_port']) ? $conf['listen_port'] : 5200; |
| 44 | - $socketType = isset($conf['socket_type']) ? (int)$conf['socket_type'] : SWOOLE_SOCK_TCP; |
|
| 44 | + $socketType = isset($conf['socket_type']) ? (int) $conf['socket_type'] : SWOOLE_SOCK_TCP; |
|
| 45 | 45 | |
| 46 | 46 | if ($socketType === SWOOLE_SOCK_UNIX_STREAM) { |
| 47 | 47 | $socketDir = dirname($ip); |
@@ -98,21 +98,21 @@ discard block |
||
| 98 | 98 | protected function bindWebSocketEvent() |
| 99 | 99 | { |
| 100 | 100 | if ($this->enableWebSocket) { |
| 101 | - $eventHandler = function ($method, array $params) { |
|
| 102 | - $this->callWithCatchException(function () use ($method, $params) { |
|
| 101 | + $eventHandler = function($method, array $params) { |
|
| 102 | + $this->callWithCatchException(function() use ($method, $params) { |
|
| 103 | 103 | call_user_func_array([$this->getWebSocketHandler(), $method], $params); |
| 104 | 104 | }); |
| 105 | 105 | }; |
| 106 | 106 | |
| 107 | - $this->swoole->on('Open', function () use ($eventHandler) { |
|
| 107 | + $this->swoole->on('Open', function() use ($eventHandler) { |
|
| 108 | 108 | $eventHandler('onOpen', func_get_args()); |
| 109 | 109 | }); |
| 110 | 110 | |
| 111 | - $this->swoole->on('Message', function () use ($eventHandler) { |
|
| 111 | + $this->swoole->on('Message', function() use ($eventHandler) { |
|
| 112 | 112 | $eventHandler('onMessage', func_get_args()); |
| 113 | 113 | }); |
| 114 | 114 | |
| 115 | - $this->swoole->on('Close', function (WebSocketServer $server, $fd, $reactorId) use ($eventHandler) { |
|
| 115 | + $this->swoole->on('Close', function(WebSocketServer $server, $fd, $reactorId) use ($eventHandler) { |
|
| 116 | 116 | $clientInfo = $server->getClientInfo($fd); |
| 117 | 117 | if (isset($clientInfo['websocket_status']) && $clientInfo['websocket_status'] === \WEBSOCKET_STATUS_FRAME) { |
| 118 | 118 | $eventHandler('onClose', func_get_args()); |
@@ -140,10 +140,10 @@ discard block |
||
| 140 | 140 | $port->set(empty($socket['settings']) ? [] : $socket['settings']); |
| 141 | 141 | |
| 142 | 142 | $handlerClass = $socket['handler']; |
| 143 | - $eventHandler = function ($method, array $params) use ($port, $handlerClass) { |
|
| 143 | + $eventHandler = function($method, array $params) use ($port, $handlerClass) { |
|
| 144 | 144 | $handler = $this->getSocketHandler($port, $handlerClass); |
| 145 | 145 | if (method_exists($handler, $method)) { |
| 146 | - $this->callWithCatchException(function () use ($handler, $method, $params) { |
|
| 146 | + $this->callWithCatchException(function() use ($handler, $method, $params) { |
|
| 147 | 147 | call_user_func_array([$handler, $method], $params); |
| 148 | 148 | }); |
| 149 | 149 | } |
@@ -160,8 +160,8 @@ discard block |
||
| 160 | 160 | 'BufferEmpty', |
| 161 | 161 | ]; |
| 162 | 162 | foreach ($events as $event) { |
| 163 | - $port->on($event, function () use ($event, $eventHandler) { |
|
| 164 | - $eventHandler('on' . $event, func_get_args()); |
|
| 163 | + $port->on($event, function() use ($event, $eventHandler) { |
|
| 164 | + $eventHandler('on'.$event, func_get_args()); |
|
| 165 | 165 | }); |
| 166 | 166 | } |
| 167 | 167 | } |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | |
| 201 | 201 | protected function bindSwooleTables() |
| 202 | 202 | { |
| 203 | - $tables = isset($this->conf['swoole_tables']) ? (array)$this->conf['swoole_tables'] : []; |
|
| 203 | + $tables = isset($this->conf['swoole_tables']) ? (array) $this->conf['swoole_tables'] : []; |
|
| 204 | 204 | foreach ($tables as $name => $table) { |
| 205 | 205 | $t = new Table($table['size']); |
| 206 | 206 | foreach ($table['column'] as $column) { |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | if (!($listener instanceof Listener)) { |
| 308 | 308 | throw new \InvalidArgumentException(sprintf('%s must extend the abstract class %s', $listenerClass, Listener::class)); |
| 309 | 309 | } |
| 310 | - $this->callWithCatchException(function () use ($listener) { |
|
| 310 | + $this->callWithCatchException(function() use ($listener) { |
|
| 311 | 311 | $listener->handle(); |
| 312 | 312 | }, [], $event->getTries()); |
| 313 | 313 | } |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | |
| 317 | 317 | protected function handleTask(Task $task) |
| 318 | 318 | { |
| 319 | - return $this->callWithCatchException(function () use ($task) { |
|
| 319 | + return $this->callWithCatchException(function() use ($task) { |
|
| 320 | 320 | $task->handle(); |
| 321 | 321 | return true; |
| 322 | 322 | }, [], $task->getTries()); |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | protected function fireEvent($event, $interface, array $arguments) |
| 326 | 326 | { |
| 327 | 327 | if (isset($this->conf['event_handlers'][$event])) { |
| 328 | - $eventHandlers = (array)$this->conf['event_handlers'][$event]; |
|
| 328 | + $eventHandlers = (array) $this->conf['event_handlers'][$event]; |
|
| 329 | 329 | foreach ($eventHandlers as $eventHandler) { |
| 330 | 330 | if (!isset(class_implements($eventHandler)[$interface])) { |
| 331 | 331 | throw new \InvalidArgumentException(sprintf( |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | ) |
| 336 | 336 | ); |
| 337 | 337 | } |
| 338 | - $this->callWithCatchException(function () use ($eventHandler, $arguments) { |
|
| 338 | + $this->callWithCatchException(function() use ($eventHandler, $arguments) { |
|
| 339 | 339 | call_user_func_array([(new $eventHandler), 'handle'], $arguments); |
| 340 | 340 | }); |
| 341 | 341 | } |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | 'class' => self::class, |
| 21 | 21 | 'redirect' => false, |
| 22 | 22 | 'pipe' => 0, |
| 23 | - 'enable' => (bool)getenv('ENABLE_APOLLO'), |
|
| 23 | + 'enable' => (bool) getenv('ENABLE_APOLLO'), |
|
| 24 | 24 | ], |
| 25 | 25 | ]; |
| 26 | 26 | } |
@@ -29,11 +29,11 @@ discard block |
||
| 29 | 29 | { |
| 30 | 30 | $filename = base_path('.env'); |
| 31 | 31 | if (isset($_ENV['LARAVEL_ENV'])) { |
| 32 | - $filename .= '.' . $_ENV['LARAVEL_ENV']; |
|
| 32 | + $filename .= '.'.$_ENV['LARAVEL_ENV']; |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | self::$apollo = Client::createFromEnv(); |
| 36 | - self::$apollo->startWatchNotification(function (array $notifications) use ($process, $filename) { |
|
| 36 | + self::$apollo->startWatchNotification(function(array $notifications) use ($process, $filename) { |
|
| 37 | 37 | $configs = self::$apollo->pullAllAndSave($filename); |
| 38 | 38 | app('log')->info('[ApolloProcess] Pull all configurations', $configs); |
| 39 | 39 | $process->exec(PHP_BINARY, [base_path('bin/laravels'), 'reload']); |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | |
| 93 | 93 | public static function getGlobalTimerCacheKey() |
| 94 | 94 | { |
| 95 | - return 'laravels:timer:' . strtolower(self::$globalTimerLockKey); |
|
| 95 | + return 'laravels:timer:'.strtolower(self::$globalTimerLockKey); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | public static function getGlobalTimerLock() |
@@ -105,21 +105,21 @@ discard block |
||
| 105 | 105 | $expire = self::GLOBAL_TIMER_LOCK_SECONDS; |
| 106 | 106 | $result = $redis->set($key, $value, 'ex', $expire, 'nx'); |
| 107 | 107 | // Compatible with Predis and PhpRedis |
| 108 | - return $result === true || ((string)$result === 'OK'); |
|
| 108 | + return $result === true || ((string) $result === 'OK'); |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | public static function isGlobalTimerAlive() |
| 112 | 112 | { |
| 113 | 113 | /**@var \Illuminate\Redis\Connections\PhpRedisConnection $redis */ |
| 114 | 114 | $redis = app('redis'); |
| 115 | - return (bool)$redis->exists(self::getGlobalTimerCacheKey()); |
|
| 115 | + return (bool) $redis->exists(self::getGlobalTimerCacheKey()); |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | public static function renewGlobalTimerLock($expire) |
| 119 | 119 | { |
| 120 | 120 | /**@var \Illuminate\Redis\Connections\PhpRedisConnection $redis */ |
| 121 | 121 | $redis = app('redis'); |
| 122 | - return (bool)$redis->expire(self::getGlobalTimerCacheKey(), $expire); |
|
| 122 | + return (bool) $redis->expire(self::getGlobalTimerCacheKey(), $expire); |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | public static function setGlobalTimerLockKey($lockKey) |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | |
| 130 | 130 | public static function setEnable($enable) |
| 131 | 131 | { |
| 132 | - self::$enable = (bool)$enable; |
|
| 132 | + self::$enable = (bool) $enable; |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | public static function isEnable() |
@@ -24,8 +24,8 @@ discard block |
||
| 24 | 24 | $config['jobs'][] = CheckGlobalTimerAliveCronJob::class; |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | - $callback = function (Process $process) use ($swoole, $config, $laravelConfig) { |
|
| 28 | - $pidfile = dirname($swoole->setting['pid_file']) . '/' . $this->timerPidFile; |
|
| 27 | + $callback = function(Process $process) use ($swoole, $config, $laravelConfig) { |
|
| 28 | + $pidfile = dirname($swoole->setting['pid_file']).'/'.$this->timerPidFile; |
|
| 29 | 29 | file_put_contents($pidfile, $process->pid); |
| 30 | 30 | $this->setProcessTitle(sprintf('%s laravels: timer process', $config['process_prefix'])); |
| 31 | 31 | $this->initLaravel($laravelConfig, $swoole); |
@@ -39,13 +39,13 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | $timerIds = $this->registerTimers($config['jobs']); |
| 41 | 41 | |
| 42 | - Process::signal(SIGUSR1, function ($signo) use ($config, $timerIds, $process) { |
|
| 42 | + Process::signal(SIGUSR1, function($signo) use ($config, $timerIds, $process) { |
|
| 43 | 43 | foreach ($timerIds as $timerId) { |
| 44 | 44 | if (Timer::exists($timerId)) { |
| 45 | 45 | Timer::clear($timerId); |
| 46 | 46 | } |
| 47 | 47 | } |
| 48 | - Timer::after($config['max_wait_time'] * 1000, function () use ($process) { |
|
| 48 | + Timer::after($config['max_wait_time'] * 1000, function() use ($process) { |
|
| 49 | 49 | $process->exit(0); |
| 50 | 50 | }); |
| 51 | 51 | }); |
@@ -76,9 +76,9 @@ discard block |
||
| 76 | 76 | if (empty($job->interval())) { |
| 77 | 77 | throw new \InvalidArgumentException(sprintf('The interval of %s cannot be empty', get_class($job))); |
| 78 | 78 | } |
| 79 | - $runJob = function () use ($job) { |
|
| 80 | - $runCallback = function () use ($job) { |
|
| 81 | - $this->callWithCatchException(function () use ($job) { |
|
| 79 | + $runJob = function() use ($job) { |
|
| 80 | + $runCallback = function() use ($job) { |
|
| 81 | + $this->callWithCatchException(function() use ($job) { |
|
| 82 | 82 | if (($job instanceof CheckGlobalTimerAliveCronJob) || $job::isEnable()) { |
| 83 | 83 | $job->run(); |
| 84 | 84 | } |