This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.0 has been updated
via 3d61c0b337476d6dd04c577de781de29e410a3ae (commit)
from f43cb5ea9501a1bdc051ed6ca955d54e430620d7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3d61c0b337476d6dd04c577de781de29e410a3ae
Author: Sylvain Beucler <[email protected]>
Date: Wed Jun 10 11:19:41 2015 +0200
web: stalled Apache2 processes are not stuck in dav_svn or git, but in
nss-pgsql; moving process clean-up to fusionforge-web
diff --git a/src/GNUmakefile b/src/GNUmakefile
index 6fa991d..5845f07 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -107,6 +107,10 @@ install-web: install-base-dirs
sed 's,@log_path@,$(log_path),g'
etc/logrotate.d/fusionforge-web \
> $(DESTDIR)$(sysconfdir)/logrotate.d/fusionforge-web; \
fi
+ if [ ! -e $(DESTDIR)$(sysconfdir)/cron.d/fusionforge-web ]; then \
+ sed 's,@bindir@,$(bindir),' etc/cron.d/fusionforge-web \
+ > $(DESTDIR)$(sysconfdir)/cron.d/fusionforge-web; \
+ fi
# TODO: multiple servers support?
# (e.g. install scm, lists, vhosts and vhosts-extra separately)
diff --git a/src/etc/cron.d/fusionforge-scm b/src/etc/cron.d/fusionforge-scm
index baaa8a8..332aa46 100644
--- a/src/etc/cron.d/fusionforge-scm
+++ b/src/etc/cron.d/fusionforge-scm
@@ -8,6 +8,3 @@
PATH=@bindir@:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
# Generate snapshots and tarballs from SCM repositories
0 3 * * * root forge_run_job scm/generate_scm_snapshots.php
-
-# Kill old Apache2 processes (excluding the main apache parent)
-1 * * * * root d=$(forge_get_config apache_service); for pid in
$(pidof $d -o $(cat /var/run/$d/$d.pid)); do etimes=$(ps -oetimes -p$pid | tail
-n+2); if [ ${etimes:-0} -gt 86400 ]; then kill -9 $pid; fi; done
diff --git a/src/etc/cron.d/fusionforge-web b/src/etc/cron.d/fusionforge-web
new file mode 100644
index 0000000..c02061b
--- /dev/null
+++ b/src/etc/cron.d/fusionforge-web
@@ -0,0 +1,8 @@
+#
+# Regular cron jobs for the fusionforge-web package
+#
+PATH=@bindir@:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+# Kill stalled Apache2 processes (excluding the main apache parent)
+# (stuck in _nss_pgsql_getpwuid_r ?)
+1 * * * * root d=$(forge_get_config apache_service); for pid in
$(pidof $d -o $(cat /var/run/$d/$d.pid)); do etimes=$(ps -oetimes -p$pid | tail
-n+2); if [ ${etimes:-0} -gt 86400 ]; then kill -9 $pid; fi; done
-----------------------------------------------------------------------
Summary of changes:
src/GNUmakefile | 4 ++++
src/etc/cron.d/fusionforge-scm | 3 ---
src/etc/cron.d/fusionforge-web | 8 ++++++++
3 files changed, 12 insertions(+), 3 deletions(-)
create mode 100644 src/etc/cron.d/fusionforge-web
diff --git a/src/GNUmakefile b/src/GNUmakefile
index 6fa991d..5845f07 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -107,6 +107,10 @@ install-web: install-base-dirs
sed 's,@log_path@,$(log_path),g'
etc/logrotate.d/fusionforge-web \
> $(DESTDIR)$(sysconfdir)/logrotate.d/fusionforge-web; \
fi
+ if [ ! -e $(DESTDIR)$(sysconfdir)/cron.d/fusionforge-web ]; then \
+ sed 's,@bindir@,$(bindir),' etc/cron.d/fusionforge-web \
+ > $(DESTDIR)$(sysconfdir)/cron.d/fusionforge-web; \
+ fi
# TODO: multiple servers support?
# (e.g. install scm, lists, vhosts and vhosts-extra separately)
diff --git a/src/etc/cron.d/fusionforge-scm b/src/etc/cron.d/fusionforge-scm
index baaa8a8..332aa46 100644
--- a/src/etc/cron.d/fusionforge-scm
+++ b/src/etc/cron.d/fusionforge-scm
@@ -8,6 +8,3 @@
PATH=@bindir@:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
# Generate snapshots and tarballs from SCM repositories
0 3 * * * root forge_run_job scm/generate_scm_snapshots.php
-
-# Kill old Apache2 processes (excluding the main apache parent)
-1 * * * * root d=$(forge_get_config apache_service); for pid in
$(pidof $d -o $(cat /var/run/$d/$d.pid)); do etimes=$(ps -oetimes -p$pid | tail
-n+2); if [ ${etimes:-0} -gt 86400 ]; then kill -9 $pid; fi; done
diff --git a/src/etc/cron.d/fusionforge-web b/src/etc/cron.d/fusionforge-web
new file mode 100644
index 0000000..c02061b
--- /dev/null
+++ b/src/etc/cron.d/fusionforge-web
@@ -0,0 +1,8 @@
+#
+# Regular cron jobs for the fusionforge-web package
+#
+PATH=@bindir@:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+# Kill stalled Apache2 processes (excluding the main apache parent)
+# (stuck in _nss_pgsql_getpwuid_r ?)
+1 * * * * root d=$(forge_get_config apache_service); for pid in
$(pidof $d -o $(cat /var/run/$d/$d.pid)); do etimes=$(ps -oetimes -p$pid | tail
-n+2); if [ ${etimes:-0} -gt 86400 ]; then kill -9 $pid; fi; done
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
