Skip to content

Commit 4470cb9

Browse files
inhereinhere
authored
update some info on start panel. (#561)
update some info on start panel.
2 parents a23799a + 7463b7e commit 4470cb9

File tree

91 files changed

+608
-325
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+608
-325
lines changed

‎.editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,8 @@ indent_size = 2
2222
[*.html]
2323
indent_size = 2
2424

25+
[*.xml]
26+
indent_size = 2
27+
2528
[Makefile]
2629
indent_style = tab

‎run.php

+44-23
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22
/** For Swoole coroutine tests */
33

44
use PHPUnit\TextUI\Command;
5+
use Swoft\Stdlib\Helper\Sys;
56
use Swoole\Coroutine;
6-
use Swoole\ExitException;
7-
8-
Coroutine::set([
9-
'log_level' => SWOOLE_LOG_INFO,
10-
'trace_flags' => 0
11-
]);
7+
use Swoole\Process;
128

139
/*
1410
* This file is part of PHPUnit.
@@ -42,23 +38,14 @@
4238
}
4339

4440
if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
45-
fwrite(STDERR,
46-
'You need to set up the project dependencies using Composer:' . PHP_EOL . PHP_EOL . ' composer install' . PHP_EOL . PHP_EOL . 'You can learn all about Composer on https://getcomposer.org/.' . PHP_EOL);
47-
die(1);
48-
}
41+
$tips = <<<TXT
42+
You need to set up the project dependencies using Composer:
43+
composer install
44+
You can learn all about Composer on https://getcomposer.org/
45+
TXT;
4946

50-
if (array_reverse(explode('/', __DIR__))[0] ?? '' === 'tests') {
51-
$vendor_dir = dirname(PHPUNIT_COMPOSER_INSTALL);
52-
$bin_unit = "{$vendor_dir}/bin/phpunit";
53-
$unit_uint = "{$vendor_dir}/phpunit/phpunit/phpunit";
54-
if (file_exists($bin_unit)) {
55-
@unlink($bin_unit);
56-
@symlink(__FILE__, $bin_unit);
57-
}
58-
if (file_exists($unit_uint)) {
59-
@unlink($unit_uint);
60-
@symlink(__FILE__, $unit_uint);
61-
}
47+
fwrite(STDERR, $tips . PHP_EOL);
48+
die(1);
6249
}
6350

6451
if (!in_array('-c', $_SERVER['argv'], true)) {
@@ -68,17 +55,51 @@
6855

6956
require PHPUNIT_COMPOSER_INSTALL;
7057

58+
// php run.php -c src/tcp-server/phpunit.xml
59+
// SWOFT_TEST_TCP_SERVER=1
60+
if (1 === (int)getenv('SWOFT_TEST_SERVER')) {
61+
// Output: "php is /usr/local/bin/php"
62+
[$ok, $ret,] = Sys::run('type php');
63+
if (0 !== $ok) {
64+
exit('php not found');
65+
}
66+
67+
$type = 'tcp';
68+
$php = substr(trim($ret), 7);
69+
$proc = new Process(function (Process $proc) use ($php, $type) {
70+
// $proc->exec($php, [ $dir . '/test/bin/swoft', 'ws:start');
71+
$proc->exec($php, ['test/bin/swoft', $type . ':start']);
72+
});
73+
$pid = $proc->start();
74+
echo "Swoft test server started, PID $pid\n";
75+
76+
// wait server starting...
77+
sleep(2);
78+
echo file_get_contents('http://127.0.0.1:28308/hi');
79+
}
80+
7181
$status = 0;
82+
83+
Coroutine::set([
84+
'log_level' => SWOOLE_LOG_INFO,
85+
'trace_flags' => 0
86+
]);
7287
\Swoft\Co::run(function () {
7388
// Status
7489
global $status;
7590

7691
try {
7792
$status = Command::main(false);
78-
} catch (ExitException $e) {
93+
} catch (Throwable $e) {
7994
$status = $e->getCode();
8095
echo 'ExitException: ' . $e->getMessage(), "\n";
8196
}
8297
});
8398

99+
if (isset($pid) && $pid > 0) {
100+
echo "Stop server on tests end. PID $pid";
101+
$ok = Process::kill($pid, 15);
102+
echo $ok ? " OK\n" : " FAIL\n";
103+
}
104+
84105
exit($status);

‎src/http-server/src/HttpErrorDispatcher.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function run(Throwable $e, Response $response): Response
3434
$handlers = Swoft::getSingleton(ErrorManager::class);
3535

3636
/** @var HttpErrorHandlerInterface $handler */
37-
if ($handler = $handlers->matchHandler($e, ErrorType::HTTP)) {
37+
if ($handler = $handlers->match($e, ErrorType::HTTP)) {
3838
return $handler->handle($e, $response);
3939
}
4040

‎src/http-server/src/Middleware/ValidatorMiddleware.php

-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
6666

6767
/* @var Request $request */
6868
[$parsedBody, $query, $path] = $validator->validateRequest($parsedBody, $validates, $query, $path);
69-
7069
if ($notParsedBody) {
7170
$parsedBody = $data;
7271
}

‎src/http-server/test/testing/Controller/ValidatorController.php

+6-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?php declare(strict_types=1);
22

3-
43
namespace SwoftTest\Http\Server\Testing\Controller;
54

65
use Swoft\Http\Message\Request;
@@ -28,7 +27,7 @@ class ValidatorController
2827
*
2928
* @return array
3029
*/
31-
public function defaultValidator(Request $request)
30+
public function defaultValidator(Request $request): array
3231
{
3332
$data = $request->getParsedBody();
3433
$data['kString'] = $request->parsedBody('string');
@@ -47,14 +46,11 @@ public function defaultValidator(Request $request)
4746
*
4847
* @return array
4948
*/
50-
public function userValidator(Request $request)
49+
public function userValidator(Request $request): array
5150
{
52-
$data = $request->getParsedBody();
53-
54-
return $data;
51+
return $request->getParsedBody();
5552
}
5653

57-
5854
/**
5955
* @Validate(validator=DefaultValidator::class, type=ValidateType::GET)
6056
* @RequestMapping(route="defaultValidatorQuery")
@@ -63,7 +59,7 @@ public function userValidator(Request $request)
6359
*
6460
* @return array
6561
*/
66-
public function defaultValidatorQuery(Request $request)
62+
public function defaultValidatorQuery(Request $request): array
6763
{
6864
$data = $request->getParsedQuery();
6965

@@ -83,11 +79,9 @@ public function defaultValidatorQuery(Request $request)
8379
*
8480
* @return array
8581
*/
86-
public function userValidatorQuery(Request $request)
82+
public function userValidatorQuery(Request $request): array
8783
{
88-
$data = $request->getParsedQuery();
89-
90-
return $data;
84+
return $request->getParsedQuery();
9185
}
9286

9387
/**

‎src/http-server/test/unit/ValidatorTest.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function testFailUserValidator(): void
5151
/**
5252
* @throws SwoftException
5353
*/
54-
public function testUserValidator()
54+
public function testUserValidator(): void
5555
{
5656
$data = [
5757
'start' => 12,
@@ -65,7 +65,7 @@ public function testUserValidator()
6565
/**
6666
* @throws ValidatorException
6767
*/
68-
public function testUserValidator2()
68+
public function testUserValidator2(): void
6969
{
7070
$data = [
7171
'start' => 12,
@@ -85,7 +85,7 @@ public function testUserValidator2()
8585
/**
8686
* @throws SwoftException
8787
*/
88-
public function testDefaultValidatorQuery()
88+
public function testDefaultValidatorQuery(): void
8989
{
9090
$data = [
9191
'string' => 'string',
@@ -105,7 +105,7 @@ public function testDefaultValidatorQuery()
105105
/**
106106
* @throws SwoftException
107107
*/
108-
public function testFailUserValidatorQuery()
108+
public function testFailUserValidatorQuery(): void
109109
{
110110
$data = [
111111
'start' => 12,
@@ -118,7 +118,7 @@ public function testFailUserValidatorQuery()
118118
/**
119119
* @throws SwoftException
120120
*/
121-
public function testUserValidatorQuery()
121+
public function testUserValidatorQuery(): void
122122
{
123123
$data = [
124124
'start' => 12,
@@ -132,7 +132,7 @@ public function testUserValidatorQuery()
132132
/**
133133
* @throws SwoftException
134134
*/
135-
public function testNoToValidate()
135+
public function testNoToValidate(): void
136136
{
137137
$content = 'swoft framework';
138138
$ext = [

‎src/log/src/Logger.php

+3-7
Original file line numberDiff line numberDiff line change
@@ -332,11 +332,7 @@ public function getProfilesInfos(): string
332332
*/
333333
public function counting(string $name, int $hit, int $total = null): void
334334
{
335-
if (!$this->enable) {
336-
return;
337-
}
338-
339-
if (!$name) {
335+
if (!$this->enable || !$name) {
340336
return;
341337
}
342338

@@ -452,7 +448,7 @@ public function flushLog(): void
452448
*
453449
* @throws Exception
454450
*/
455-
public function appendNoticeLog($flush = false): void
451+
public function appendNoticeLog(bool $flush = false): void
456452
{
457453
if (!$this->enable) {
458454
return;
@@ -468,8 +464,8 @@ public function appendNoticeLog($flush = false): void
468464
unset($this->profiles[$cid], $this->countings[$cid], $this->pushlogs[$cid], $this->profileStacks[$cid]);
469465
$levelName = self::$levels[self::NOTICE];
470466

467+
// Json
471468
if ($this->json) {
472-
// Json
473469
$message = $this->formatRecord('', [], self::NOTICE, $levelName, $ts, []);
474470
unset($message['messages']);
475471

‎src/rpc-server/src/Middleware/ValidatorMiddleware.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?php declare(strict_types=1);
22

3-
43
namespace Swoft\Rpc\Server\Middleware;
54

65
use Swoft\Bean\Annotation\Mapping\Bean;
@@ -34,8 +33,7 @@ class ValidatorMiddleware implements MiddlewareInterface
3433
public function process(RequestInterface $request, RequestHandlerInterface $requestHandler): ResponseInterface
3534
{
3635
[$status, $className] = $request->getAttribute(Request::ROUTER_ATTRIBUTE);
37-
38-
if ($status != Router::FOUND) {
36+
if ($status !== Router::FOUND) {
3937
return $requestHandler->handle($request);
4038
}
4139

@@ -53,4 +51,4 @@ public function process(RequestInterface $request, RequestHandlerInterface $requ
5351
$request = $request->withParams(array_values($paramsMap));
5452
return $requestHandler->handle($request);
5553
}
56-
}
54+
}

‎src/server/src/Command/BaseServerCommand.php

+17-7
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
/**
1919
* Class BaseServerCommand
20+
*
2021
* @since 2.0
2122
*/
2223
abstract class BaseServerCommand
@@ -50,9 +51,10 @@ protected function showServerInfoPanel(Server $server): void
5051

5152
// Port listeners
5253
$panel = $this->appendPortsToPanel($server, $panel);
54+
$title = sprintf('SERVER INFORMATION(v%s)', Swoft::VERSION);
5355

5456
// Show server info
55-
Show::panel($panel, 'Server Information', [
57+
Show::panel($panel, $title, [
5658
'titleStyle' => 'cyan',
5759
]);
5860

@@ -104,12 +106,19 @@ protected function buildMainServerInfo(Server $server): array
104106
$mainHost = $server->getHost();
105107
$mainPort = $server->getPort();
106108

107-
return [
109+
$info = [
108110
'listen' => $mainHost . ':' . $mainPort,
109-
'type' => $server->getTypeName(),
110-
'mode' => $server->getModeName(),
111-
'worker' => $workerNum,
111+
// 'type' => $server->getTypeName(),
112+
'Mode' => $server->getModeName(),
113+
'Worker' => $workerNum,
112114
];
115+
116+
$taskNum = $settings['task_worker_num'] ?? 0;
117+
if ($taskNum > 0) {
118+
$info['Task worker'] = $taskNum;
119+
}
120+
121+
return $info;
113122
}
114123

115124
/**
@@ -128,10 +137,11 @@ protected function appendPortsToPanel(Server $server, array $panel): array
128137
continue;
129138
}
130139

131-
$upperName = strtoupper($name);
140+
$upperName = strtoupper($name);
132141
$panel[$upperName] = [
133142
'listen' => $listener->getHost() . ':' . $listener->getPort(),
134-
'type' => $listener->getTypeName()
143+
// 'type' => $listener->getTypeName(),
144+
'(attached)'
135145
];
136146
}
137147

‎src/validator/src/Annotation/Mapping/ValidateType.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class ValidateType
1313
/**
1414
* Get query params
1515
*/
16-
public const GET = 'get';
16+
public const GET = 'get';
1717

1818
/**
1919
* Post form and body

‎src/validator/src/Annotation/Parser/AfterDateParser.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
class AfterDateParser extends Parser
2020
{
2121
/**
22-
* @param int $type
22+
* @param int $type
2323
* @param object $annotationObject
2424
*
2525
* @return array

‎src/validator/src/Annotation/Parser/AlphaDashParser.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
class AlphaDashParser extends Parser
2020
{
2121
/**
22-
* @param int $type
22+
* @param int $type
2323
* @param object $annotationObject
2424
*
2525
* @return array

‎src/validator/src/Annotation/Parser/AlphaNumParser.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
class AlphaNumParser extends Parser
2020
{
2121
/**
22-
* @param int $type
22+
* @param int $type
2323
* @param object $annotationObject
2424
*
2525
* @return array

‎src/validator/src/Annotation/Parser/AlphaParser.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
class AlphaParser extends Parser
2020
{
2121
/**
22-
* @param int $type
22+
* @param int $type
2323
* @param object $annotationObject
2424
*
2525
* @return array

0 commit comments

Comments
 (0)