projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
2b63830
)
fix logger
author
Michael Wallner
<mike@php.net>
Mon, 3 Aug 2015 08:18:15 +0000
(10:18 +0200)
committer
Michael Wallner
<mike@php.net>
Mon, 3 Aug 2015 08:18:15 +0000
(10:18 +0200)
tests/helper/server.inc
patch
|
blob
|
history
diff --git
a/tests/helper/server.inc
b/tests/helper/server.inc
index 6cf6acf996c49698c0a9d35ed83fb553b6fb71f4..c522c63f473df6a2cdfe1f9662b7d356cd2f2232 100644
(file)
--- a/
tests/helper/server.inc
+++ b/
tests/helper/server.inc
@@
-3,9
+3,12
@@
ini_set("log_errors", true);
ini_set("error_log", __DIR__."/server.log");
ini_set("log_errors", true);
ini_set("error_log", __DIR__."/server.log");
-function log() {
- error_log(sprintf("%s: %s\n", date("[Y-m-d H:i:s]"),
- call_user_func_array("sprintf", func_get_args())));
+function logger() {
+ error_log(sprintf("%s(%s): %s",
+ basename(getenv("SCRIPT_FILENAME"), ".php"),
+ basename(current(get_included_files()), ".inc"),
+ call_user_func_array("sprintf", func_get_args())
+ ));
}
$php = getenv('TEST_PHP_EXECUTABLE');
}
$php = getenv('TEST_PHP_EXECUTABLE');
@@
-24,26
+27,26
@@
function serve($cb) {
*/
$offset = rand(0,2000);
foreach (range(8000+$offset, 9000+$offset) as $port) {
*/
$offset = rand(0,2000);
foreach (range(8000+$offset, 9000+$offset) as $port) {
- log("serve: Trying port %d", $port);
+ log
ger
("serve: Trying port %d", $port);
if (($server = @stream_socket_server("tcp://localhost:$port"))) {
fprintf(STDERR, "%s\n", $port);
if (($server = @stream_socket_server("tcp://localhost:$port"))) {
fprintf(STDERR, "%s\n", $port);
- log("serve: Using port %d", $port);
+ log
ger
("serve: Using port %d", $port);
do {
$R = array($server); $W = array(); $E = array();
$select = stream_select($R, $E, $E, 0, 10000);
if ($select && ($client = stream_socket_accept($server, 1))) {
do {
$R = array($server); $W = array(); $E = array();
$select = stream_select($R, $E, $E, 0, 10000);
if ($select && ($client = stream_socket_accept($server, 1))) {
- log("serve: Accept client %d", (int) $client);
+ log
ger
("serve: Accept client %d", (int) $client);
if (getenv("PHP_HTTP_TEST_SSL")) {
stream_socket_enable_crypto($client, true, STREAM_CRYPTO_METHOD_SSLv23_SERVER);
}
try {
while (!feof($client)) {
if (getenv("PHP_HTTP_TEST_SSL")) {
stream_socket_enable_crypto($client, true, STREAM_CRYPTO_METHOD_SSLv23_SERVER);
}
try {
while (!feof($client)) {
- log("serve: Handle client %d", (int) $client);
+ log
ger
("serve: Handle client %d", (int) $client);
$cb($client);
}
$cb($client);
}
- log("serve: EOF on client %d", (int) $client);
+ log
ger
("serve: EOF on client %d", (int) $client);
} catch (Exception $ex) {
} catch (Exception $ex) {
- log("serve: Exception on client %d", (int) $client);
+ log
ger
("serve: Exception on client %d", (int) $client);
/* ignore disconnect */
if ($ex->getMessage() !== "Empty message received from stream") {
fprintf(STDERR, "%s\n", $ex);
/* ignore disconnect */
if ($ex->getMessage() !== "Empty message received from stream") {
fprintf(STDERR, "%s\n", $ex);
@@
-125,4
+128,4
@@
function proc($bin, $args, $cb) {
fpassthru($stderr);
fpassthru($stdout);
}
fpassthru($stderr);
fpassthru($stdout);
}
-}
\ No newline at end of file
+}