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.1 has been updated
via 966f5089b213e6d936fe687e7ce8887f6e9b56d7 (commit)
from 73ed5914d1e143208a7bf4e531ea25c935ac1e44 (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=966f5089b213e6d936fe687e7ce8887f6e9b56d7
commit 966f5089b213e6d936fe687e7ce8887f6e9b56d7
Author: Franck Villaume <[email protected]>
Date: Sat Jan 20 18:20:39 2018 +0100
fix cronman page by using the correct job id, clean-up create_vhosts.php
diff --git a/src/cronjobs/db/massmail.php b/src/cronjobs/db/massmail.php
index ee7fabd..c6ed7fb 100755
--- a/src/cronjobs/db/massmail.php
+++ b/src/cronjobs/db/massmail.php
@@ -169,7 +169,7 @@ m_exit($mess);
function m_exit($mess = '') {
global $err;
- if (!cron_entry(6,$mess.$err)) {
+ if (!cron_entry('MASSMAIL', $mess.$err)) {
// rely on crond to report the error
echo "cron_entry error: ".db_error()."\n";
}
diff --git a/src/cronjobs/ftp/ftp_create_group_access.php
b/src/cronjobs/ftp/ftp_create_group_access.php
index 0dd17fd..2a17c05 100755
--- a/src/cronjobs/ftp/ftp_create_group_access.php
+++ b/src/cronjobs/ftp/ftp_create_group_access.php
@@ -77,4 +77,4 @@ function execute($cmd) {
return $res;
}
-cron_entry(31, $err);
+cron_entry('FTP_ACCESS', $err);
diff --git a/src/cronjobs/lists/mailing_lists_create.php
b/src/cronjobs/lists/mailing_lists_create.php
index 14b81f9..c0d4cf0 100755
--- a/src/cronjobs/lists/mailing_lists_create.php
+++ b/src/cronjobs/lists/mailing_lists_create.php
@@ -344,4 +344,4 @@ for($k = 0; $k < $rows; $k++) {
}
}
-cron_entry(18, $err);
+cron_entry('LISTS', $err);
diff --git a/src/cronjobs/scm/create_scm_repos.php
b/src/cronjobs/scm/create_scm_repos.php
index c976556..9e7b13a 100755
--- a/src/cronjobs/scm/create_scm_repos.php
+++ b/src/cronjobs/scm/create_scm_repos.php
@@ -56,7 +56,7 @@ $hook_params = array ('output' => '') ;
plugin_hook_by_reference ('scm_update_repolist', $hook_params) ;
$output .= $hook_params['output'];
-cron_entry(27, $output);
+cron_entry('SCM_REPO', $output);
// Local Variables:
// mode: php
diff --git a/src/cronjobs/shell/homedirs.php b/src/cronjobs/shell/homedirs.php
index b42857c..1806608 100755
--- a/src/cronjobs/shell/homedirs.php
+++ b/src/cronjobs/shell/homedirs.php
@@ -178,4 +178,4 @@ while ($row = db_fetch_array($res)) {
}
}
-cron_entry(25,$err);
+cron_entry('HOMEDIR', $err);
diff --git a/src/cronjobs/web-vhosts/create_vhosts.php
b/src/cronjobs/web-vhosts/create_vhosts.php
index 20dc531..9698f9e 100755
--- a/src/cronjobs/web-vhosts/create_vhosts.php
+++ b/src/cronjobs/web-vhosts/create_vhosts.php
@@ -26,26 +26,25 @@ require_once $gfcommon.'include/pre.php';
require_once $gfcommon.'include/cron_utils.php';
if (!forge_get_config('use_project_vhost')) {
- cron_entry(30, _('forge not using vhost'));
+ cron_entry('WEB_VHOSTS', _('forge not using vhost'));
}
$output = '';
session_set_admin();
$res = db_query_params('SELECT vh.vhost_name, vh.docdir, vh.cgidir,
g.unix_group_name
-FROM prweb_vhost vh, groups g
-WHERE g.status = $1 AND vh.group_id = g.group_id
-ORDER BY vh.vhost_name',
+ FROM prweb_vhost vh, groups g
+ WHERE g.status = $1 AND vh.group_id = g.group_id
+ ORDER BY vh.vhost_name',
array ('A'));
if (!$res) {
- cron_entry(30, _('Unable to get list of projects with vhost:
').db_error());
+ cron_entry('WEB_VHOSTS', _('Unable to get list of projects with
vhost')._(': ').db_error());
}
-$httpdRestartedMsg = _('httpd server not restarted');
-
$inTemplateVhostFile = forge_get_config('custom_path').'/httpd.vhosts.tmpl';
-if (!is_readable($inTemplateVhostFile))
+if (!is_readable($inTemplateVhostFile)) {
$inTemplateVhostFile =
forge_get_config('source_path').'/templates/httpd.vhosts.tmpl';
+}
$outVhostsFile = forge_get_config('config_path').'/httpd.conf.d/httpd.vhosts';
$logPath = forge_get_config('log_path');
$groupdirPrefix = forge_get_config('groupdir_prefix');
@@ -64,5 +63,5 @@ while ($arr = db_fetch_array($res)) {
cron_reload_apache();
-$output .= $count._(' vhost created.').' '.$httpdRestartedMsg;
-cron_entry(30, $output);
+$output .= $count._(' vhost created.');
+cron_entry('WEB_VHOSTS', $output);
-----------------------------------------------------------------------
Summary of changes:
src/cronjobs/db/massmail.php | 2 +-
src/cronjobs/ftp/ftp_create_group_access.php | 2 +-
src/cronjobs/lists/mailing_lists_create.php | 2 +-
src/cronjobs/scm/create_scm_repos.php | 2 +-
src/cronjobs/shell/homedirs.php | 2 +-
src/cronjobs/web-vhosts/create_vhosts.php | 19 +++++++++----------
6 files changed, 14 insertions(+), 15 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
