@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $server[$headerServerMapping[$key]] = $value; |
52 | 52 | } else { |
53 | 53 | $key = str_replace('-', '_', $key); |
54 | - $server['http_' . $key] = $value; |
|
54 | + $server['http_'.$key] = $value; |
|
55 | 55 | } |
56 | 56 | } |
57 | 57 | $server = array_change_key_case($server, CASE_UPPER); |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | && isset($_SERVER['QUERY_STRING']) |
66 | 66 | && $_SERVER['QUERY_STRING'] !== '' |
67 | 67 | ) { |
68 | - $_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING']; |
|
68 | + $_SERVER['REQUEST_URI'] .= '?'.$_SERVER['QUERY_STRING']; |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | // 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 | Portal::runLaravelSCommand($laravelConf['root_path'], 'reload'); |
34 | 34 | if ($log) { |
35 | 35 | $action = 'file:'; |
@@ -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 | } |
@@ -26,9 +26,9 @@ discard block |
||
26 | 26 | continue; |
27 | 27 | } |
28 | 28 | $processClass = $item['class']; |
29 | - $restartInterval = isset($item['restart_interval']) ? (int)$item['restart_interval'] : 5; |
|
30 | - $callback = function (Process $worker) use ($pidfile, $swoole, $processPrefix, $processClass, $restartInterval, $name, $laravelConfig) { |
|
31 | - file_put_contents($pidfile, $worker->pid . "\n", FILE_APPEND | LOCK_EX); |
|
29 | + $restartInterval = isset($item['restart_interval']) ? (int) $item['restart_interval'] : 5; |
|
30 | + $callback = function(Process $worker) use ($pidfile, $swoole, $processPrefix, $processClass, $restartInterval, $name, $laravelConfig) { |
|
31 | + file_put_contents($pidfile, $worker->pid."\n", FILE_APPEND | LOCK_EX); |
|
32 | 32 | $this->initLaravel($laravelConfig, $swoole); |
33 | 33 | if (!isset(class_implements($processClass)[CustomProcessInterface::class])) { |
34 | 34 | throw new \InvalidArgumentException( |
@@ -42,13 +42,13 @@ discard block |
||
42 | 42 | /**@var CustomProcessInterface $processClass */ |
43 | 43 | $this->setProcessTitle(sprintf('%s laravels: %s process', $processPrefix, $name)); |
44 | 44 | |
45 | - Process::signal(SIGUSR1, function ($signo) use ($name, $processClass, $worker, $pidfile, $swoole) { |
|
45 | + Process::signal(SIGUSR1, function($signo) use ($name, $processClass, $worker, $pidfile, $swoole) { |
|
46 | 46 | $this->info(sprintf('Reloading %s process[PID=%d].', $name, $worker->pid)); |
47 | 47 | $processClass::onReload($swoole, $worker); |
48 | 48 | }); |
49 | 49 | |
50 | 50 | if (method_exists($processClass, 'onStop')) { |
51 | - Process::signal(SIGTERM, function ($signo) use ($name, $processClass, $worker, $pidfile, $swoole) { |
|
51 | + Process::signal(SIGTERM, function($signo) use ($name, $processClass, $worker, $pidfile, $swoole) { |
|
52 | 52 | $this->info(sprintf('Stopping %s process[PID=%d].', $name, $worker->pid)); |
53 | 53 | $processClass::onStop($swoole, $worker); |
54 | 54 | }); |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | for ($i = 0; $i < $item['num']; $i++) { |
73 | 73 | $process = $this->makeProcess($callback, $item); |
74 | 74 | $swoole->addProcess($process); |
75 | - $processList[$name . $i] = $process; |
|
75 | + $processList[$name.$i] = $process; |
|
76 | 76 | } |
77 | 77 | } else { // For single process |
78 | 78 | $process = $this->makeProcess($callback, $item); |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | 'value' => $apcSmaInfo['avail_mem'], |
31 | 31 | ], |
32 | 32 | ]; |
33 | - foreach (new \APCuIterator('/^' . $this->config['apcu_key_prefix'] . $this->config['apcu_key_separator'] . '/') as $item) { |
|
33 | + foreach (new \APCuIterator('/^'.$this->config['apcu_key_prefix'].$this->config['apcu_key_separator'].'/') as $item) { |
|
34 | 34 | $parts = explode($this->config['apcu_key_separator'], $item['key']); |
35 | 35 | parse_str($parts[3], $labels); |
36 | 36 | if (is_array($item['value'])) { |
@@ -62,8 +62,8 @@ discard block |
||
62 | 62 | $metrics = $this->getMetrics(); |
63 | 63 | $lines = []; |
64 | 64 | foreach ($metrics as $metric) { |
65 | - $lines[] = "# HELP " . $metric['name'] . " {$metric['help']}"; |
|
66 | - $lines[] = "# TYPE " . $metric['name'] . " {$metric['type']}"; |
|
65 | + $lines[] = "# HELP ".$metric['name']." {$metric['help']}"; |
|
66 | + $lines[] = "# TYPE ".$metric['name']." {$metric['type']}"; |
|
67 | 67 | |
68 | 68 | $metricLabels = isset($metric['labels']) ? $metric['labels'] : []; |
69 | 69 | $labels = ['{']; |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | } |
74 | 74 | $labels[] = '}'; |
75 | 75 | $labelStr = implode('', $labels); |
76 | - $lines[] = $metric['name'] . "$labelStr {$metric['value']}"; |
|
76 | + $lines[] = $metric['name']."$labelStr {$metric['value']}"; |
|
77 | 77 | } |
78 | 78 | return implode("\n", $lines); |
79 | 79 | } |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | 'class' => static::class, |
22 | 22 | 'redirect' => false, |
23 | 23 | 'pipe' => 0, |
24 | - 'enable' => (bool)config('prometheus.enable', true), |
|
24 | + 'enable' => (bool) config('prometheus.enable', true), |
|
25 | 25 | ], |
26 | 26 | ]; |
27 | 27 | } |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | $taskWorkerNum = isset($swoole->setting['task_worker_num']) ? $swoole->setting['task_worker_num'] : 0; |
39 | 39 | $totalNum = $workerNum + $taskWorkerNum - 1; |
40 | 40 | $workerIds = range(0, $totalNum); |
41 | - $runJob = function () use ($swoole, $workerIds, $processCollector, $swooleStatsCollector, $systemCollector) { |
|
41 | + $runJob = function() use ($swoole, $workerIds, $processCollector, $swooleStatsCollector, $systemCollector) { |
|
42 | 42 | // Collect the metrics of Swoole stats() |
43 | 43 | $swooleStatsCollector->collect(); |
44 | 44 |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | 'class' => static::class, |
22 | 22 | 'redirect' => false, |
23 | 23 | 'pipe' => 0, |
24 | - 'enable' => (bool)getenv('ENABLE_APOLLO'), |
|
24 | + 'enable' => (bool) getenv('ENABLE_APOLLO'), |
|
25 | 25 | ], |
26 | 26 | ]; |
27 | 27 | } |
@@ -30,11 +30,11 @@ discard block |
||
30 | 30 | { |
31 | 31 | $filename = base_path('.env'); |
32 | 32 | if (isset($_ENV['_ENV'])) { |
33 | - $filename .= '.' . $_ENV['_ENV']; |
|
33 | + $filename .= '.'.$_ENV['_ENV']; |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | self::$apollo = Client::createFromEnv(); |
37 | - self::$apollo->startWatchNotification(function (array $notifications) use ($process, $filename) { |
|
37 | + self::$apollo->startWatchNotification(function(array $notifications) use ($process, $filename) { |
|
38 | 38 | $configs = self::$apollo->pullAllAndSave($filename); |
39 | 39 | app('log')->info('[ApolloProcess] Pull all configurations', $configs); |
40 | 40 | Portal::runLaravelSCommand(base_path(), 'reload'); |
@@ -15,31 +15,31 @@ |
||
15 | 15 | public function boot() |
16 | 16 | { |
17 | 17 | $this->publishes([ |
18 | - __DIR__ . '/../../../config/prometheus.php' => base_path('config/prometheus.php'), |
|
18 | + __DIR__.'/../../../config/prometheus.php' => base_path('config/prometheus.php'), |
|
19 | 19 | ]); |
20 | 20 | } |
21 | 21 | |
22 | 22 | public function register() |
23 | 23 | { |
24 | 24 | $this->mergeConfigFrom( |
25 | - __DIR__ . '/../../../config/prometheus.php', 'prometheus' |
|
25 | + __DIR__.'/../../../config/prometheus.php', 'prometheus' |
|
26 | 26 | ); |
27 | - $this->app->singleton(RequestMiddleware::class, function ($app) { |
|
27 | + $this->app->singleton(RequestMiddleware::class, function($app) { |
|
28 | 28 | return new RequestMiddleware($app->make(HttpRequestCollector::class)); |
29 | 29 | }); |
30 | - $this->app->singleton(HttpRequestCollector::class, function ($app) { |
|
30 | + $this->app->singleton(HttpRequestCollector::class, function($app) { |
|
31 | 31 | return new HttpRequestCollector($app['config']->get('prometheus')); |
32 | 32 | }); |
33 | - $this->app->singleton(SwooleProcessCollector::class, function ($app) { |
|
33 | + $this->app->singleton(SwooleProcessCollector::class, function($app) { |
|
34 | 34 | return new SwooleProcessCollector($app['config']->get('prometheus')); |
35 | 35 | }); |
36 | - $this->app->singleton(SwooleStatsCollector::class, function ($app) { |
|
36 | + $this->app->singleton(SwooleStatsCollector::class, function($app) { |
|
37 | 37 | return new SwooleStatsCollector($app['config']->get('prometheus')); |
38 | 38 | }); |
39 | - $this->app->singleton(SystemCollector::class, function ($app) { |
|
39 | + $this->app->singleton(SystemCollector::class, function($app) { |
|
40 | 40 | return new SystemCollector($app['config']->get('prometheus')); |
41 | 41 | }); |
42 | - $this->app->singleton(Exporter::class, function ($app) { |
|
42 | + $this->app->singleton(Exporter::class, function($app) { |
|
43 | 43 | return new Exporter($app['config']->get('prometheus')); |
44 | 44 | }); |
45 | 45 | } |
@@ -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 | |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | { |
74 | 74 | static $dispatch; |
75 | 75 | if (!$dispatch) { |
76 | - $dispatch = static function ($task) { |
|
76 | + $dispatch = static function($task) { |
|
77 | 77 | /**@var \Swoole\Http\Server $swoole */ |
78 | 78 | $swoole = app('swoole'); |
79 | 79 | // The worker_id of timer process is -1 |
@@ -131,9 +131,9 @@ discard block |
||
131 | 131 | if ($value === false) { |
132 | 132 | continue; |
133 | 133 | } |
134 | - $passOptionStr .= sprintf('--%s%s ', $key, is_bool($value) ? '' : ('=' . $value)); |
|
134 | + $passOptionStr .= sprintf('--%s%s ', $key, is_bool($value) ? '' : ('='.$value)); |
|
135 | 135 | } |
136 | - $statusCode = self::runArtisanCommand($this->basePath, trim('laravels config ' . $passOptionStr)); |
|
136 | + $statusCode = self::runArtisanCommand($this->basePath, trim('laravels config '.$passOptionStr)); |
|
137 | 137 | if ($statusCode !== 0) { |
138 | 138 | return $statusCode; |
139 | 139 | } |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | $config = $this->getConfig(); |
143 | 143 | |
144 | 144 | if (!$config['server']['ignore_check_pid'] && file_exists($config['server']['swoole']['pid_file'])) { |
145 | - $pid = (int)file_get_contents($config['server']['swoole']['pid_file']); |
|
145 | + $pid = (int) file_get_contents($config['server']['swoole']['pid_file']); |
|
146 | 146 | if ($pid > 0 && self::kill($pid, 0)) { |
147 | 147 | $this->warning(sprintf('Swoole[PID=%d] is already running.', $pid)); |
148 | 148 | return 1; |
@@ -194,8 +194,8 @@ discard block |
||
194 | 194 | $basePath = dirname($pidFile); |
195 | 195 | $deleteFiles = [ |
196 | 196 | $pidFile, |
197 | - $basePath . '/laravels-custom-processes.pid', |
|
198 | - $basePath . '/laravels-timer-process.pid', |
|
197 | + $basePath.'/laravels-custom-processes.pid', |
|
198 | + $basePath.'/laravels-timer-process.pid', |
|
199 | 199 | ]; |
200 | 200 | foreach ($deleteFiles as $deleteFile) { |
201 | 201 | if (file_exists($deleteFile)) { |
@@ -237,9 +237,9 @@ discard block |
||
237 | 237 | } |
238 | 238 | |
239 | 239 | // Reload custom processes |
240 | - $pidFile = dirname($pidFile) . '/laravels-custom-processes.pid'; |
|
240 | + $pidFile = dirname($pidFile).'/laravels-custom-processes.pid'; |
|
241 | 241 | if (file_exists($pidFile)) { |
242 | - $pids = (array)explode("\n", trim(file_get_contents($pidFile))); |
|
242 | + $pids = (array) explode("\n", trim(file_get_contents($pidFile))); |
|
243 | 243 | unlink($pidFile); |
244 | 244 | foreach ($pids as $pid) { |
245 | 245 | if (!$pid || !self::kill($pid, 0)) { |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | |
258 | 258 | // Reload timer process |
259 | 259 | if (!empty($config['server']['timer']['enable']) && !empty($config['server']['timer']['jobs'])) { |
260 | - $pidFile = dirname($pidFile) . '/laravels-timer-process.pid'; |
|
260 | + $pidFile = dirname($pidFile).'/laravels-timer-process.pid'; |
|
261 | 261 | $pid = file_get_contents($pidFile); |
262 | 262 | if (!$pid || !self::kill($pid, 0)) { |
263 | 263 | $this->error("Timer process[PID={$pid}] does not exist, or permission denied."); |
@@ -281,9 +281,9 @@ discard block |
||
281 | 281 | public function loadApollo(array $options) |
282 | 282 | { |
283 | 283 | Client::putCommandOptionsToEnv($options); |
284 | - $envFile = $this->basePath . '/.env'; |
|
284 | + $envFile = $this->basePath.'/.env'; |
|
285 | 285 | if (isset($options['env'])) { |
286 | - $envFile .= '.' . $options['env']; |
|
286 | + $envFile .= '.'.$options['env']; |
|
287 | 287 | } |
288 | 288 | Client::createFromCommandOptions($options)->pullAllAndSave($envFile); |
289 | 289 | } |
@@ -314,12 +314,12 @@ discard block |
||
314 | 314 | $checkSwooleCmd = $phpCmd.' --ri swoole'; |
315 | 315 | $checkOpenSwooleCmd = $phpCmd.' --ri openswoole'; |
316 | 316 | // Short-circuit, if Swoole is found Loaded already. If not, check for Open-Swoole as well. |
317 | - if (stripos((string)shell_exec($checkSwooleCmd), 'enabled') === false |
|
318 | - && stripos((string)shell_exec($checkOpenSwooleCmd), 'enabled') === false) { |
|
317 | + if (stripos((string) shell_exec($checkSwooleCmd), 'enabled') === false |
|
318 | + && stripos((string) shell_exec($checkOpenSwooleCmd), 'enabled') === false) { |
|
319 | 319 | $phpCmd .= ' -d "extension=swoole"'; |
320 | 320 | } |
321 | 321 | |
322 | - return trim($phpCmd . ' ' . $subCmd); |
|
322 | + return trim($phpCmd.' '.$subCmd); |
|
323 | 323 | } |
324 | 324 | |
325 | 325 | public static function runArtisanCommand($basePath, $cmd) |
@@ -336,16 +336,16 @@ discard block |
||
336 | 336 | |
337 | 337 | public function getConfig() |
338 | 338 | { |
339 | - return unserialize((string)file_get_contents($this->getConfigPath())); |
|
339 | + return unserialize((string) file_get_contents($this->getConfigPath())); |
|
340 | 340 | } |
341 | 341 | |
342 | 342 | protected function getConfigPath() |
343 | 343 | { |
344 | 344 | $storagePath = getenv('APP_STORAGE_PATH'); |
345 | 345 | if ($storagePath === false) { |
346 | - $storagePath = $this->basePath . '/storage'; |
|
346 | + $storagePath = $this->basePath.'/storage'; |
|
347 | 347 | } |
348 | - return $storagePath . '/laravels.conf'; |
|
348 | + return $storagePath.'/laravels.conf'; |
|
349 | 349 | } |
350 | 350 | |
351 | 351 | public static function runCommand($cmd, $input = null) |
@@ -366,7 +366,7 @@ discard block |
||
366 | 366 | public static function kill($pid, $sig) |
367 | 367 | { |
368 | 368 | try { |
369 | - return Process::kill((int)$pid, $sig); |
|
369 | + return Process::kill((int) $pid, $sig); |
|
370 | 370 | } catch (\Exception $e) { |
371 | 371 | return false; |
372 | 372 | } |