egroupware_official/doc/rpm-build/asyncservice.patch

63 lines
2.0 KiB
Diff
Raw Normal View History

2016-05-25 19:04:49 +02:00
diff --git egroupware/admin/inc/class.admin_asyncservice.inc.php egroupware/admin/inc/class.admin_asyncservice.inc.php
index cb19e5fbbf..2e58ce3fdf 100644
2016-05-25 19:04:49 +02:00
--- egroupware/admin/inc/class.admin_asyncservice.inc.php
+++ egroupware/admin/inc/class.admin_asyncservice.inc.php
@@ -97,16 +97,20 @@ class admin_asyncservice
2014-12-09 19:01:27 +01:00
{
2016-05-25 19:04:49 +02:00
Api\Config::save_value('asyncservice', $GLOBALS['egw_info']['server']['asyncservice']=$_POST['asyncservice'], 'phpgwapi');
2009-06-01 20:32:41 +02:00
}
+/*
if (!$async->only_fallback)
{
$installed = $async->installed();
if (is_array($installed) && isset($installed['cronline']))
2006-03-28 01:38:30 +02:00
{
2009-06-01 20:32:41 +02:00
+*/
$async_use['cron'] = lang('crontab only (recomended)');
+/*
2006-03-28 01:38:30 +02:00
}
2009-06-01 20:32:41 +02:00
}
$async_use[''] = lang('fallback (after each pageview)');
$async_use['off'] = lang('disabled (not recomended)');
+*/
echo '<p><b>'.lang('Run Asynchronous services').'</b>'.
' <select name="asyncservice" onChange="this.form.submit();">';
foreach ($async_use as $key => $label)
2016-05-25 19:04:49 +02:00
@@ -128,8 +132,9 @@ class admin_asyncservice
2009-06-01 20:32:41 +02:00
}
else
{
- echo '<p>'.lang('Installed crontab').": \n";
2016-05-25 19:04:49 +02:00
+ echo '<p>'.lang('Installed crontab').": /etc/cron.d/egroupware.cron\n";
2009-06-01 20:32:41 +02:00
+/*
if (is_array($installed) && isset($installed['cronline']))
2006-03-28 01:38:30 +02:00
{
2009-06-01 20:32:41 +02:00
echo "$installed[cronline]</p>";
2016-05-25 19:04:49 +02:00
@@ -144,6 +149,7 @@ class admin_asyncservice
2006-03-28 01:38:30 +02:00
}
2009-06-01 20:32:41 +02:00
echo '<p><input type="submit" name="install" value="'.lang('Install crontab')."\">\n".
lang("for the times below (empty values count as '*', all empty = every minute)")."</p>\n";
+*/
}
2016-05-25 19:04:49 +02:00
2009-06-01 20:32:41 +02:00
echo "<hr><table border=0><tr>\n";
diff --git a/api/src/Egw.php b/api/src/Egw.php
2016-05-25 19:04:49 +02:00
--- egroupware/api/src/Egw.php
+++ egroupware/api/src/Egw.php
2017-11-07 14:11:05 +01:00
@@ -608,12 +608,14 @@ class Egw extends Egw\Base
2014-04-17 15:56:47 +02:00
_egw_log_exception($ex);
}
2011-06-17 12:24:40 +02:00
}
+/* not needed as rpm uses /etc/cron.d/egroupware
2014-04-17 15:56:47 +02:00
// call the asyncservice check_run function if it is not explicitly set to cron-only
2011-06-17 12:24:40 +02:00
if (!$GLOBALS['egw_info']['server']['asyncservice']) // is default
{
2016-05-25 19:04:49 +02:00
$async = new Asyncservice();
$async->check_run('fallback');
2011-06-17 12:24:40 +02:00
}
2016-05-25 19:04:49 +02:00
+*/
2011-06-17 12:24:40 +02:00
$this->db->disconnect();
}
}