Merge lp:~jibel/ubuntu/precise/jenkins/LP993065_Keep_logging_after_rotation into lp:ubuntu/precise/jenkins

Proposed by Jean-Baptiste Lallement
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~jibel/ubuntu/precise/jenkins/LP993065_Keep_logging_after_rotation
Merge into: lp:ubuntu/precise/jenkins
Diff against target: 59 lines (+14/-3)
4 files modified
debian/changelog (+8/-0)
debian/control (+2/-1)
debian/jenkins-slave.logrotate (+2/-1)
debian/jenkins.logrotate (+2/-1)
To merge this branch: bzr merge lp:~jibel/ubuntu/precise/jenkins/LP993065_Keep_logging_after_rotation
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+169049@code.launchpad.net

Description of the change

This patch uses copytruncate to rotate jenkins log file so jenkins doesn't lose the original file handle.

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

I applied the patch to the precise-updates version and uploaded to the precise-proposed SRU review queue. Closing MP manually. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-03-27 09:17:51 +0000
3+++ debian/changelog 2013-06-12 19:54:38 +0000
4@@ -1,3 +1,11 @@
5+jenkins (1.424.6+dfsg-1ubuntu1) precise; urgency=low
6+
7+ * Ensure jenkins keeps logging after log rotation (LP: #993065).
8+ - d/*.logrotate: Switch to copytruncate so jenkins does not lose the
9+ original file handle.
10+
11+ -- Jean-Baptiste Lallement <jean-baptiste.lallement@canonical.com> Wed, 12 Jun 2013 19:24:47 +0200
12+
13 jenkins (1.424.6+dfsg-1) unstable; urgency=low
14
15 * New upstream release, fixing XSS security vulnerability (Closes: #664057):
16
17=== modified file 'debian/control'
18--- debian/control 2012-03-27 09:17:51 +0000
19+++ debian/control 2013-06-12 19:54:38 +0000
20@@ -1,7 +1,8 @@
21 Source: jenkins
22 Section: java
23 Priority: optional
24-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
25+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
26+XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
27 Uploaders: James Page <james.page@ubuntu.com>
28 Build-Depends:
29 cdbs,
30
31=== modified file 'debian/jenkins-slave.logrotate'
32--- debian/jenkins-slave.logrotate 2011-07-20 11:11:18 +0000
33+++ debian/jenkins-slave.logrotate 2013-06-12 19:54:38 +0000
34@@ -1,8 +1,9 @@
35 /var/log/jenkins/jenkins-slave.log {
36 daily
37+ copytruncate
38 missingok
39 rotate 7
40 compress
41+ delaycompress
42 notifempty
43- create 644 jenkins jenkins
44 }
45
46=== modified file 'debian/jenkins.logrotate'
47--- debian/jenkins.logrotate 2011-07-20 11:11:18 +0000
48+++ debian/jenkins.logrotate 2013-06-12 19:54:38 +0000
49@@ -1,8 +1,9 @@
50 /var/log/jenkins/jenkins.log {
51 daily
52+ copytruncate
53 missingok
54 rotate 7
55 compress
56+ delaycompress
57 notifempty
58- create 644 jenkins jenkins
59 }

Subscribers

People subscribed via source and target branches