mod_http_upload: Check availability of ImageMagick
Log an error message during startup if the thumbnail option is enabled but ImageMagick is not installed.
This commit is contained in:
		
							parent
							
								
									d46ee127e7
								
							
						
					
					
						commit
						5359525d3c
					
				@ -272,6 +272,18 @@ init({ServerHost, Opts}) ->
 | 
				
			|||||||
      Mode ->
 | 
					      Mode ->
 | 
				
			||||||
	  file:change_mode(DocRoot, Mode)
 | 
						  file:change_mode(DocRoot, Mode)
 | 
				
			||||||
    end,
 | 
					    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),
 | 
					    ejabberd_router:register_route(Host),
 | 
				
			||||||
    {ok, #state{server_host = ServerHost, host = Host, name = Name,
 | 
					    {ok, #state{server_host = ServerHost, host = Host, name = Name,
 | 
				
			||||||
		access = Access, max_size = MaxSize,
 | 
							access = Access, max_size = MaxSize,
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user