wip

notch8 · Nov 6, 2024 · 9fd2528 · 9fd2528
1 parent 7f35ea9
commit 9fd2528
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/config/vendor/imagemagick-6-policy.xml b/config/vendor/imagemagick-6-policy.xml
@@ -49,12 +49,12 @@
   -->
 
   <!-- IiifPrint: allow more than default Ubuntu policy, re: RAM, Disk -->
-  <policy domain="resource" name="memory" value="512MiB"/>
-  <policy domain="resource" name="map" value="1GiB"/>
-  <policy domain="resource" name="width" value="20KP"/>
-  <policy domain="resource" name="height" value="20KP"/>
-  <policy domain="resource" name="area" value="128MB"/>
-  <policy domain="resource" name="disk" value="2GiB"/>
+  <policy domain="resource" name="memory" value="16GiB"/>
+  <policy domain="resource" name="map" value="32GiB"/>
+  <policy domain="resource" name="disk" value="200GiB"/>
+  <policy domain="resource" name="width" value="100KP"/>
+  <policy domain="resource" name="height" value="100KP"/>
+  <policy domain="resource" name="area" value="500GiB"/>
 
   <policy domain="cache" name="shared-secret" value="passphrase"/>
   <policy domain="coder" rights="none" pattern="EPHEMERAL" />

diff --git a/lib/iiif_print/image_tool.rb b/lib/iiif_print/image_tool.rb
@@ -74,8 +74,11 @@ def im_identify_geometry(lines)
 
     # @return [Array<String>] lines of output from imagemagick `identify`
     def im_identify
-      cmd = "identify -format 'Geometry: %G\nDepth: %[bit-depth]\nColorspace: %[colorspace]\nAlpha: %A\nMIME type: %m\n' #{path}"
-      `#{cmd}`.lines
+      cmd = "identify -limit memory 8GiB -limit map 16GiB -limit disk 50GiB -format 'Geometry: %G\nDepth: %[bit-depth]\nColorspace: %[colorspace]\nAlpha: %A\nMIME type: %m\n' #{path}"
+      output, status = Open3.capture2(cmd)
+      Rails.logger.info "Identify command output: #{output}"
+      Rails.logger.info "Identify command status: #{status}"
+      output.lines
     end
 
     def im_mime(lines)