[svn] r5306 - trunk/tools/dstat

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-04-21 19:22:44 +0200 (Sat, 21 Apr 2007)
New Revision: 5306

Modified:
   trunk/tools/dstat/ChangeLog
   trunk/tools/dstat/dstat
Log:
Use SIG_IGN instead of SIG_DFL to disable alarm signal.

Modified: trunk/tools/dstat/ChangeLog
===================================================================
--- trunk/tools/dstat/ChangeLog	2007-04-20 21:44:52 UTC (rev 5305)
+++ trunk/tools/dstat/ChangeLog	2007-04-21 17:22:44 UTC (rev 5306)
@@ -1,7 +1,8 @@
-* 0.6.5svn - ... - released 18/04/2007
+* 0.6.5svn - ... - released 21/04/2007
 - Removed SwapCached from the Cached counter. (Peter Rabbitson)
 - Fixed a file descriptor problem on kernel 2.4. (Liviu Daia)
 - Install manpage as part of the make install phase. (Scott Baker)
+- Use SIG_IGN instead of SIG_DFL to disable alarm signal.
 
 * 0.6.5 - Torrox - released 17/04/2007
 - Added VMware ESX plugins (Bert de Bruijn)

Modified: trunk/tools/dstat/dstat
===================================================================
--- trunk/tools/dstat/dstat	2007-04-20 21:44:52 UTC (rev 5305)
+++ trunk/tools/dstat/dstat	2007-04-21 17:22:44 UTC (rev 5306)
@@ -1254,6 +1254,7 @@
 		self.init(self.vars, 1)
 
 	def extract(self):
+		### FIXME: Add milliseconds when using --debug (see dstat_epoch)
 		self.val['time'] = time.strftime('%d-%m %H:%M:%S', time.localtime())
 
 	def show(self):
@@ -1662,8 +1663,7 @@
 	signal.alarm(interval)
 
 def exit(ret):
-	if 'signal' in sys.modules.keys():
-		signal.signal(signal.SIGALRM, signal.SIG_DFL)
+	signal.signal(signal.SIGALRM, signal.SIG_IGN)
 	sys.stdout.write(ansi['reset'])
 	sys.exit(ret)
 
@@ -1920,6 +1920,8 @@
 		step = ((update - 1) % op.delay) + 1
 		tick = step
 
+	signal.signal(signal.SIGALRM, signal.SIG_IGN)
+
 ### Main entrance
 if __name__ == '__main__':
 	try: