Merge trunk revision 2660:

r2660 | sdake | 2010-02-18 13:08:39 -0700 (Thu, 18 Feb 2010) | 3 lines

Patch to set unset value in token hold cancel structure as to not crash
wireshark.



git-svn-id: http://svn.fedorahosted.org/svn/corosync/branches/flatiron@2705 fd59a12c-fef9-0310-b244-a6a79926bd2f

exec/totemsrp.c

@@ -2627,6 +2627,7 @@ static int token_hold_cancel_send (struct totemsrp_instance *instance)
 	 */
 	token_hold_cancel.header.type = MESSAGE_TYPE_TOKEN_HOLD_CANCEL;
 	token_hold_cancel.header.endian_detector = ENDIAN_LOCAL;
+	token_hold_cancel.header.encapsulated = 0;
 	token_hold_cancel.header.nodeid = instance->my_id.addr[0].nodeid;
 	memcpy (&token_hold_cancel.ring_id, &instance->my_ring_id,
 		sizeof (struct memb_ring_id));

man/corosync.conf.5

@@ -488,6 +488,31 @@ and
 
 The default is syslog and stderr.
 
+Please note, if you are using to_logfile and want to rotate the file, use logrotate(8)
+with the option 
+.B
+copytruncate.
+eg.
+.IP
+.RS
+.ne 18
+.nf
+.ta 4n 30n 33n
+/var/log/corosync.log {
+	missingok
+	compress
+	notifempty
+	daily
+	rotate 7
+	copytruncate
+}
+.ta
+.fi
+.RE
+.IP
+.PP
+
+
 .TP
 logfile
 If the
@@ -562,5 +587,6 @@ required.
 The corosync executive configuration file.
 
 .SH "SEE ALSO"
-.BR corosync_overview (8)
+.BR corosync_overview (8),
+.BR logrotate (8)
 .PP