diff --git a/ipasserelle-base.spec b/ipasserelle-base.spec index 02fdbde..e0ed272 100644 --- a/ipasserelle-base.spec +++ b/ipasserelle-base.spec @@ -1,4 +1,4 @@ -%define version 0.2.4 +%define version 0.2.5 %define release 1 %define name ipasserelle-base @@ -45,6 +45,9 @@ Based on SMEServer, iPasserelle is a specially configured SME Server, with some additionnal modules %changelog +* Tue Apr 24 2012 Daniel Berteaud 0.2.5-1.sme +- Kill qpsmtpd after 1h instead of 30min + * Mon Apr 16 2012 Daniel Berteaud 0.2.4-1.sme - Revert previous commit, havp is now in front of squid diff --git a/root/etc/cron.hourly/qpsmtpd-cleanup b/root/etc/cron.hourly/qpsmtpd-cleanup index 6b0172c..641ab3a 100644 --- a/root/etc/cron.hourly/qpsmtpd-cleanup +++ b/root/etc/cron.hourly/qpsmtpd-cleanup @@ -10,8 +10,8 @@ $t = new Proc::ProcessTable; foreach $p ( @{$t->table} ){ next unless $p->cmndline =~ m#^/usr/bin/qpsmtpd-forkserver#; my $diff = time - $p->start; - # Process is more than 30 minutes old ? - if ($diff > 1800){ + # Process is more than 1 hour old ? + if ($diff > 3600){ syslog('info', "Killing PID " . $p->pid . "(" . $p->cmndline . ") because it looks like a stalled qpsmtpd process"); $p->kill(9);