[evolvis-commits] r18408: small-fixes pending merges:↵ Thorsten Glaser 2012-05-14 allow CLI scripts to consume all server memory (RAM)↵ Thorsten Glaser 2012-05-14 for good measure, enable maximum error_reporting for CLI scripts too↵ Thorsten Glaser 2012-05-14 disable·output·buffering·when·running·outside·of·the·Web

mirabilos at evolvis.org mirabilos at evolvis.org
Mon May 14 11:36:30 CEST 2012


Author: mirabilos
Date: 2012-05-14 11:36:29 +0200 (Mon, 14 May 2012)
New Revision: 18408

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/include/env.inc.php
   trunk/gforge_base/evolvisforge-5.1/src/common/include/pre.php
   trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_MySurveys.class.php
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot
Log:
small-fixes pending merges:
  Thorsten Glaser 2012-05-14 allow CLI scripts to consume all server memory (RAM)
    Thorsten Glaser 2012-05-14 for good measure, enable maximum error_reporting for CLI scripts too
    Thorsten Glaser 2012-05-14 disable·output·buffering·when·running·outside·of·the·Web

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/env.inc.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/env.inc.php	2012-05-14 08:17:49 UTC (rev 18407)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/env.inc.php	2012-05-14 09:36:29 UTC (rev 18408)
@@ -7,6 +7,17 @@
  * 
  */
 
+if (!getenv('SERVER_SOFTWARE')) {
+	/* when running outside of the Web */
+
+	/* enable maximum error reporting */
+	error_reporting(-1);
+	/* disable output buffering */
+	$no_gz_buffer = true;
+	/* allow it to eat all memory */
+	ini_set("memory_limit", -1);
+}
+
 // Attempt to set up the include path, to fix problems with relative includes
 $fusionforge_basedir = dirname(dirname(dirname( __FILE__ ))) ;
 $include_path = join(PATH_SEPARATOR, 

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_MySurveys.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_MySurveys.class.php	2012-05-14 08:17:49 UTC (rev 18407)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_MySurveys.class.php	2012-05-14 09:36:29 UTC (rev 18408)
@@ -109,7 +109,7 @@
 					}
 				}
 
-				$html_hdr .= '['.count($surveys).($count_new ? ", <b>".sprintf(_('%s new'), array($count_new))."</b>]" : ']').'</td></tr>';
+				$html_hdr .= '['.count($surveys).($count_new ? ", <b>".sprintf(_('%s new'), $count_new)."</b>]" : ']').'</td></tr>';
 				$html_my_surveys .= $html_hdr.$html;
 			}
 			$html_my_surveys .= '</table>';

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-05-14 08:17:49 UTC (rev 18407)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-05-14 09:36:29 UTC (rev 18408)
@@ -1,3 +1,10 @@
+fusionforge (1:5.1.1+evolvis60) unstable; urgency=high
+
+  * Unlimit memory consumption of CLI scripts/cronjobs, for large instances
+  * Disable output buffering, enable error reporting, in scripts/cronjobs
+
+ -- Thorsten Glaser <t.glaser at tarent.de>  Mon, 14 May 2012 11:33:34 +0200
+
 fusionforge (1:5.1.1+evolvis59) unstable; urgency=low
 
   * Move Site Admin globalTab to a predictable place

Modified: trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot	2012-05-14 08:17:49 UTC (rev 18407)
+++ trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot	2012-05-14 09:36:29 UTC (rev 18408)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-14 10:14+0200\n"
+"POT-Creation-Date: 2012-05-14 11:33+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"



More information about the evolvis-commits mailing list