Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TestServer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
YAPEX
TestServer
Commits
8827b937
Commit
8827b937
authored
4 years ago
by
Janis Daniel Dähne
Browse files
Options
Downloads
Patches
Plain Diff
- we now append the runner debug log into the timings debug log
parent
17157595
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
constants.php
+4
-1
4 additions, 1 deletion
constants.php
protocolHeaderPartParser.php
+22
-0
22 additions, 0 deletions
protocolHeaderPartParser.php
with
26 additions
and
1 deletion
constants.php
+
4
−
1
View file @
8827b937
...
...
@@ -3,7 +3,7 @@
# variables
//use this to know which version we published
$versionString
=
'2.
6.3
'
;
$versionString
=
'2.
7.0
'
;
$rootDirNameToUseString
=
'work'
;
$isDebug
=
false
;
//logs debug to STDOUT
...
...
@@ -63,6 +63,8 @@ $regexMathAllFilesAttribute = '*';
$responseNewLineString
=
'\r\n'
;
//to match interface
$runnerNewLineString
=
"
\\
r
\\
n"
;
//starting with runner version 2.4
$runnerDebugLogNewLineString
=
"
\\
n"
;
# known error codes
$status_code_Ok
=
0
;
...
...
@@ -151,6 +153,7 @@ $s_timeForUserProgram = 'timeForUserProgram';
$s_output_without_header_part
=
'stripedOutput'
;
$s_characterLimitExceeded
=
'characterLimitExceeded'
;
$s_characterLimitUsed
=
'characterLimitUsed'
;
$s_headerKeyCharacterRunnerDebugLog
=
'runnerDebugLog'
;
$s_header_part_separator
=
"---
\\
r
\\
n"
;
...
...
This diff is collapsed.
Click to expand it.
protocolHeaderPartParser.php
+
22
−
0
View file @
8827b937
...
...
@@ -11,6 +11,9 @@ function parseHeaderPart($output)
global
$s_output_without_header_part
;
global
$s_characterLimitExceeded
;
global
$runnerNewLineString
;
global
$s_headerKeyCharacterRunnerDebugLog
;
global
$s_timings_string_separator
;
//if we have no header tuples we might have only so ---\n
...
...
@@ -24,6 +27,7 @@ function parseHeaderPart($output)
$timeForCompiling
=
NULL
;
$timeForUserProgram
=
NULL
;
$characterLimitExceeded
=
FALSE
;
$runnerDebugLogLines
=
[];
$headerPartLines
=
explode
(
$runnerNewLineString
,
$headerPartText
);
...
...
@@ -67,7 +71,25 @@ function parseHeaderPart($output)
$characterLimitExceeded
=
strtolower
(
$val
)
===
'true'
;
}
else
if
(
strpos
(
$line
,
$s_headerKeyCharacterRunnerDebugLog
)
===
0
)
{
$val
=
substr
(
$line
,
strlen
(
$s_headerKeyCharacterRunnerDebugLog
)
+
1
);
if
(
$val
===
null
)
continue
;
if
(
!
empty
(
$val
))
{
$runnerDebugLogLines
=
explode
(
$s_timings_string_separator
,
$val
);
addToDebugTimings
(
"--start runner debug lines"
);
#aadd the runner debug lines to the timings log
foreach
(
$runnerDebugLogLines
as
$runnerLogLine
)
{
addToDebugTimings
(
$runnerLogLine
);
}
addToDebugTimings
(
"--finish runner debug lines"
);
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment