]> granicus.if.org Git - ejabberd/commitdiff
mod_http_upload: Check availability of ImageMagick
authorHolger Weiss <holger@zedat.fu-berlin.de>
Mon, 2 Nov 2015 00:12:10 +0000 (01:12 +0100)
committerHolger Weiss <holger@zedat.fu-berlin.de>
Mon, 2 Nov 2015 00:12:10 +0000 (01:12 +0100)
Log an error message during startup if the thumbnail option is enabled
but ImageMagick is not installed.

src/mod_http_upload.erl

index c88e768f2ea47ba1c851e14df56d509a87fb156e..a2aee27d7618cffac539f5002b791ac0899a9c6f 100644 (file)
@@ -272,6 +272,18 @@ init({ServerHost, Opts}) ->
       Mode ->
          file:change_mode(DocRoot, Mode)
     end,
+    case Thumbnail of
+      true ->
+         case string:str(os:cmd("identify"), "Magick") of
+           0 ->
+               ?ERROR_MSG("Cannot find 'identify' command, please install "
+                          "ImageMagick or disable thumbnail creation", []);
+           _ ->
+               ok
+         end;
+      false ->
+         ok
+    end,
     ejabberd_router:register_route(Host),
     {ok, #state{server_host = ServerHost, host = Host, name = Name,
                access = Access, max_size = MaxSize,