Merge ~utkarsh/ubuntu/+source/rabbitmq-server:lp1921425-logrotate-issue-focal into ubuntu/+source/rabbitmq-server:ubuntu/focal-devel

[Utkarsh Gupta]

Hello,

This MP intends to fix LP: #1921425, the logrotate issue.

Whilst there are no tests in this package, but the changes are trivial so I don't suspect any problem there.

PPA at https://launchpad.net/~utkarsh/+archive/ubuntu/experimental-dump.

Requesting you to please review and sponsor this. TIA! \o/

[Utkarsh Gupta (utkarsh)]

Also, in the SRU template, I've been a bit hesitant to change the "test plan" section and let the user's tests be there, as-is. I don't expect that to be a problem but I thought it's worth mentioning it once here for the reviewer.

[Christian Ehrhardt  (paelzer)]

Same as groovy:
=> https://code.launchpad.net/~utkarsh/ubuntu/+source/rabbitmq-server/+git/rabbitmq-server/+merge/400639/comments/1054952

review: Needs Fixing

[Utkarsh Gupta (utkarsh)]

Hi Christian,

Thanks for the review. I tend to agree with your thoughts on this. So after looking at this again, I think it's best to keep this upload just for fixing the bug in question (double log rotation) and I've fixed this MP to echo that.

Could you please re-review and sponsor if it's OK now? TIA! \o/

[Christian Ehrhardt  (paelzer)]

Along the Focal reivew, this LGTM now.
It is the same as the Focal change + different changelog + update-maintainers

review: Approve

[Christian Ehrhardt  (paelzer)]

s/focal/groovy/, you know what I mean as these two MPs are closely tied together :-)

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/rabbitmq-server
 * [new tag] upload/3.8.2-0ubuntu1.2 -> upload/3.8.2-0ubuntu1.2

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading rabbitmq-server_3.8.2-0ubuntu1.2.dsc: done.
  Uploading rabbitmq-server_3.8.2-0ubuntu1.2.debian.tar.xz: done.
  Uploading rabbitmq-server_3.8.2-0ubuntu1.2_source.buildinfo: done.
  Uploading rabbitmq-server_3.8.2-0ubuntu1.2_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

This is accepted in F/G-proposed and imported in git-ubuntu

 rabbitmq-server | 3.8.2-0ubuntu1.2 | focal-proposed | source, all
 rabbitmq-server | 3.8.5-1ubuntu0.1 | groovy-proposed | source, all

Closing the MP

diff --git a/debian/changelog b/debian/changelog
index fb5debe..312e5f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+rabbitmq-server (3.8.2-0ubuntu1.2) focal; urgency=medium
+
+  [ Thomas Goirand ]
+  * d/rabbitmq-server.logrotate: Do not use a sharedscripts, as
+    rabbitmq-server detects the log rotation by itself. (LP: #1921425)
+
+ -- Utkarsh Gupta <[e-mail]>  Tue, 06 Apr 2021 15:48:23 +0530
+
 rabbitmq-server (3.8.2-0ubuntu1.1) focal; urgency=medium
 
   * Fix timeout discrepancy between SysV and systemd (LP: #1874075)
diff --git a/debian/rabbitmq-server.logrotate b/debian/rabbitmq-server.logrotate
index c786df7..86b696a 100644
--- a/debian/rabbitmq-server.logrotate
+++ b/debian/rabbitmq-server.logrotate
@@ -1,12 +1,8 @@
 /var/log/rabbitmq/*.log {
-        weekly
-        missingok
-        rotate 20
-        compress
-        delaycompress
-        notifempty
-        sharedscripts
-        postrotate
-            /etc/init.d/rabbitmq-server rotate-logs > /dev/null
-        endscript
+	weekly
+	missingok
+	rotate 20
+	compress
+	delaycompress
+	notifempty
 }