Просмотр исходного кода

Increase import size (#2563)

* Increase import size

This is merely a temporary workaround to allow at least some medium size
imports
https://framateam.org/freshrss/pl/7wbt4tcyetrfmris9xdcbq7uuw
The import module should be rewritten to process files one by one and as
data streams instead of loading multiple copies of the whole dataset in
memory as is the case now :-(
https://github.com/FreshRSS/FreshRSS/issues/1890
Note that the new SQLite export/import is distinct from this case.

* Use parameter
Alexandre Alapetite 6 лет назад
Родитель
Сommit
077e3cff45
2 измененных файлов с 20 добавлено и 0 удалено
  1. 2 0
      Docker/entrypoint.sh
  2. 18 0
      app/Controllers/importExportController.php

+ 2 - 0
Docker/entrypoint.sh

@@ -6,6 +6,8 @@ chown -R :www-data .
 chmod -R g+r . && chmod -R g+w ./data/
 
 find /etc/php*/ -name php.ini -exec sed -r -i "\\#^;?date.timezone#s#^.*#date.timezone = $TZ#" {} \;
+find /etc/php*/ -name php.ini -exec sed -r -i "\\#^;?post_max_size#s#^.*#post_max_size = 32M#" {} \;
+find /etc/php*/ -name php.ini -exec sed -r -i "\\#^;?upload_max_filesize#s#^.*#upload_max_filesize = 32M#" {} \;
 
 if [ -n "$CRON_MIN" ]; then
 	(

+ 18 - 0
app/Controllers/importExportController.php

@@ -29,7 +29,25 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		Minz_View::prependTitle(_t('sub.import_export.title') . ' · ');
 	}
 
+	private static function megabytes($size_str) {
+		switch (substr($size_str, -1)) {
+			case 'M': case 'm': return (int)$size_str;
+			case 'K': case 'k': return (int)$size_str / 1024;
+			case 'G': case 'g': return (int)$size_str * 1024;
+		}
+		return $size_str;
+	}
+
+	private static function minimumMemory($mb) {
+		$mb = (int)$mb;
+		$ini = self::megabytes(ini_get('memory_limit'));
+		if ($ini < $mb) {
+			ini_set('memory_limit', $mb . 'M');
+		}
+	}
+
 	public function importFile($name, $path, $username = null) {
+		self::minimumMemory(256);
 		require_once(LIB_PATH . '/lib_opml.php');
 
 		$this->catDAO = new FreshRSS_CategoryDAO($username);