aboutsummaryrefslogtreecommitdiffstats
path: root/includes/jobqueue/Job.php
diff options
context:
space:
mode:
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>2023-03-23 20:50:30 +0000
committerGerrit Code Review <gerrit@wikimedia.org>2023-03-23 20:50:30 +0000
commitb5660897755b481acb174f5925b5b9f28b12236c (patch)
treeb66fbd7808af54e2f11b3af648526024ba181f2e /includes/jobqueue/Job.php
parent8fb44ec4adf66d4f6196942ce4f37336e9c0640c (diff)
parent9ec64a1ee049540a1d6d3524ffb8b369559a3f63 (diff)
downloadmediawikicore-b5660897755b481acb174f5925b5b9f28b12236c.tar.gz
mediawikicore-b5660897755b481acb174f5925b5b9f28b12236c.zip
Merge "jobqueue: Strip line break from Job::toString debug log line"
Diffstat (limited to 'includes/jobqueue/Job.php')
-rw-r--r--includes/jobqueue/Job.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/includes/jobqueue/Job.php b/includes/jobqueue/Job.php
index 00838031f3e6..05b14c2cf65d 100644
--- a/includes/jobqueue/Job.php
+++ b/includes/jobqueue/Job.php
@@ -401,6 +401,10 @@ abstract class Job implements RunnableJob {
$flatValue = "string(" . mb_strlen( $value ) . ")";
}
+ // Remove newline characters from the value, since
+ // newlines indicate new job lines in log files
+ $flatValue = preg_replace( '/\s+/', ' ', $flatValue );
+
$paramString .= "$key={$flatValue}";
}
}