[stable26] emit an event when a message is logged by backportbot-nextcloud[bot] · Pull Request #38815 · nextcloud/server

backportbot-nextcloud · 2023-06-14T14:54:14Z

Backport of #38490

ChristophWurst · 2023-06-15T09:56:03Z

This is a backport of a new API. Is this really necessary or could there be a workaround?

ChristophWurst · 2023-06-15T09:57:05Z

It's for nextcloud/logreader#873 so I would say this should not be backported.

blizzz · 2023-06-15T09:57:32Z

This is a backport of a new API. Is this really necessary or could there be a workaround?

right, and since annotations also would need to be adjusted if we have a reason to backport, missed them.

blizzz · 2023-06-15T09:58:25Z

+/**
+ * Even for when a log item is being logged
+ *
+ * @since 28.0.0


change @SInCE annotations to specific 26.0.x target version.

blizzz · 2023-06-15T09:58:58Z

moving to 26.0.4 then

see comment

icewind1991 · 2023-06-15T15:34:19Z

updated the sinces, included #38843

reasoning behind the backport is making nextcloud/logreader#873 available for debugging earlier as it could be very usefull during support

blizzz · 2023-07-11T22:56:00Z

needs another reviewer

blizzz · 2023-07-13T12:45:00Z

moving to 26.0.5

come-nc · 2023-07-17T14:24:12Z

Wait, why is this updating 3rdparty?

blizzz

doubts about 3rdparty bump

blizzz · 2023-07-17T14:33:28Z

@ice

Wait, why is this updating 3rdparty?

@icewind1991 accidental?

blizzz · 2023-08-03T08:58:59Z

moving to 26.0.6

blizzz · 2023-09-07T09:44:15Z

moving to 26.0.7

Signed-off-by: Robin Appelman <robin@icewind.nl>

icewind1991 · 2023-09-18T14:36:21Z

fixed the accidental 3rdparty change

come-nc · 2023-09-19T07:39:11Z

+
+ // inject the event dispatcher into the logger
+ // this is done here because there is a cyclic dependency between the event dispatcher and logger
+ if ($this->logger instanceof Log or $this->logger instanceof Log\PsrLoggerAdapter) {


Suggested change
if ($this->loggerinstanceof Log or$this->loggerinstanceofLog\PsrLoggerAdapter) {
if ($this->loggerinstanceof Log ||$this->loggerinstanceofLog\PsrLoggerAdapter) {
This is a backport so it should be left as-is, but we usually use ||/&& and not or/and

icewind1991 · 2023-09-19T12:41:54Z

@blizzz can you re-review?

blizzz · 2023-09-22T12:00:32Z

+	private $message;
+
+	/**
+ * @since 28.0.0


all @since annotations should reflect the target version of the backport

resolved

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

susnux · 2023-11-09T10:52:35Z

+ * @return string
+ * @since 26.0.8
+ */
+	public function getMessage(): string {


#38843 was not backported, wrong type.

backportbot-nextcloudBot added this to the Nextcloud 26.0.3 milestone Jun 14, 2023

backportbot-nextcloudBot requested review from come-nc, icewind1991 and nfebe June 14, 2023 14:54

blizzz mentioned this pull request Jun 14, 2023
26.0.3 RC1 #38755
Merged

blizzz added the 3. to review Waiting for reviews label Jun 14, 2023

blizzz previously approved these changes Jun 14, 2023
View reviewed changes

ChristophWurst added the enhancement label Jun 15, 2023

blizzz reviewed Jun 15, 2023
View reviewed changes

blizzz modified the milestones: Nextcloud 26.0.3, Nextcloud 26.0.4 Jun 15, 2023

ChristophWurst added the pending documentation This pull request needs an associated documentation update label Jun 15, 2023

nextcloud deleted a comment from hopklaas35 Jun 15, 2023

icewind1991 force-pushed the backport/38490/stable26 branch from c802e50 to decbd93Compare June 15, 2023 15:32

blizzz mentioned this pull request Jul 10, 2023
26.0.4 RC1 #39281
Merged

blizzz approved these changes Jul 10, 2023
View reviewed changes

blizzz modified the milestones: Nextcloud 26.0.4, Nextcloud 26.0.5 Jul 13, 2023

come-nc approved these changes Jul 17, 2023
View reviewed changes

blizzz previously requested changes Jul 17, 2023
View reviewed changes

blizzz assigned icewind1991 Aug 2, 2023

blizzz modified the milestones: Nextcloud 26.0.5, Nextcloud 26.0.6 Aug 3, 2023

blizzz mentioned this pull request Sep 5, 2023
26.0.6 RC1 #40277
Merged

blizzz modified the milestones: Nextcloud 26.0.6, Nextcloud 26.0.7 Sep 7, 2023

icewind1991 force-pushed the backport/38490/stable26 branch from decbd93 to fde250fCompare September 18, 2023 14:31

emit an event when a message is logged
c1452aa
Signed-off-by: Robin Appelman <robin@icewind.nl>

icewind1991 force-pushed the backport/38490/stable26 branch from fde250f to c1452aaCompare September 18, 2023 14:33

icewind1991 requested a review from blizzz September 18, 2023 14:33

come-nc approved these changes Sep 19, 2023
View reviewed changes

icewind1991 mentioned this pull request Sep 19, 2023
[26] allow printing log messages during occ nextcloud/logreader#998
Merged
1 task

This was referenced Sep 20, 2023
26.0.7, #40526
Closed
26.0.7 #40528
Merged

blizzz modified the milestones: Nextcloud 26.0.7, Nextcloud 26.0.8 Sep 20, 2023

blizzz reviewed Sep 22, 2023
View reviewed changes

blizzz mentioned this pull request Oct 9, 2023
26.0.8 RC1 #40841
Merged

fix(api): set the correct version in since annotation
d0fb608
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

blizzz approved these changes Oct 11, 2023
View reviewed changes

blizzz enabled auto-merge October 11, 2023 08:48

blizzz merged commit 2fc6a67 into stable26Oct 11, 2023

blizzz deleted the backport/38490/stable26 branch October 11, 2023 10:10

susnux reviewed Nov 9, 2023
View reviewed changes

skjnldsv removed the pending documentation This pull request needs an associated documentation update label Mar 27, 2025

	if ($this->loggerinstanceof Log or$this->loggerinstanceofLog\PsrLoggerAdapter) {
	if ($this->loggerinstanceof Log \|\|$this->loggerinstanceofLog\PsrLoggerAdapter) {

Uh oh!

Uh oh!

Conversation

backportbot-nextcloudBot commented Jun 14, 2023

Uh oh!

ChristophWurst commented Jun 15, 2023

Uh oh!

ChristophWurst commented Jun 15, 2023

Uh oh!

blizzz commented Jun 15, 2023

Uh oh!

blizzzJun 15, 2023

Choose a reason for hiding this comment

Uh oh!

blizzz commented Jun 15, 2023

Uh oh!

icewind1991 commented Jun 15, 2023

Uh oh!

blizzz commented Jul 11, 2023

Uh oh!

blizzz commented Jul 13, 2023

Uh oh!

come-nc commented Jul 17, 2023

Uh oh!

blizzz left a comment

Choose a reason for hiding this comment

Uh oh!

blizzz commented Jul 17, 2023

Uh oh!

blizzz commented Aug 3, 2023

Uh oh!

blizzz commented Sep 7, 2023

Uh oh!

icewind1991 commented Sep 18, 2023

Uh oh!

come-ncSep 19, 2023

Choose a reason for hiding this comment

Uh oh!

icewind1991 commented Sep 19, 2023

Uh oh!

blizzzSep 22, 2023

Choose a reason for hiding this comment

Uh oh!

susnuxNov 9, 2023

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants