inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-05-12 17:04:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

REPO-3335 Enterprise Docker and docker-compose simplified by pulling in transformer images

Browse Source
This commit is contained in:
Alan Davis 2018-03-17 12:27:55 +00:00
parent 2d6fafaf1c
commit 8d338d1b55
2 changed files with 160 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

303
alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/JodConverterSharedInstance.java
View File

@ -69,6 +69,7 @@ public class JodConverterSharedInstance implements InitializingBean, DisposableB
// "${jodconverter.maxTasksPerProcess}" will be injected. // "${jodconverter.maxTasksPerProcess}" will be injected.
private Integer maxTasksPerProcess; private Integer maxTasksPerProcess;
private String url;
private String officeHome; private String officeHome;
private int[] portNumbers; private int[] portNumbers;
private Long taskExecutionTimeout; private Long taskExecutionTimeout;
@ -90,6 +91,11 @@ public class JodConverterSharedInstance implements InitializingBean, DisposableB
} }
} }
public void setUrl(String url)
{
this.url = url;
}
public void setOfficeHome(String officeHome) public void setOfficeHome(String officeHome)
{ {
this.officeHome = officeHome == null ? "" : officeHome.trim(); this.officeHome = officeHome == null ? "" : officeHome.trim();
@ -170,7 +176,7 @@ public class JodConverterSharedInstance implements InitializingBean, DisposableB
public void setConnectTimeout(String connectTimeout) public void setConnectTimeout(String connectTimeout)
{ {
this.connectTimeout = parseStringForLong(connectTimeout.trim()); this.connectTimeout = parseStringForLong(connectTimeout.trim());
} }
public void setEnabled(String enabled) public void setEnabled(String enabled)
@ -248,8 +254,8 @@ public class JodConverterSharedInstance implements InitializingBean, DisposableB
int[] getPortNumbers() int[] getPortNumbers()
{ {
return (enabled == null || !enabled) && deprecatedOooEnabled != null && deprecatedOooEnabled return (enabled == null || !enabled) && deprecatedOooEnabled != null && deprecatedOooEnabled
? deprecatedOooPortNumbers ? deprecatedOooPortNumbers
: portNumbers; : portNumbers;
} }
private Long parseStringForLong(String string) private Long parseStringForLong(String string)
@ -277,8 +283,8 @@ public class JodConverterSharedInstance implements InitializingBean, DisposableB
*/ */
public boolean isAvailable() public boolean isAvailable()
{ {
final boolean result = isAvailable && officeManager != null; final boolean result = isAvailable && (officeManager != null || (url != null && !url.isEmpty()));
return result; return result;
} }
/* /*
@ -287,8 +293,8 @@ public class JodConverterSharedInstance implements InitializingBean, DisposableB
*/ */
public void afterPropertiesSet() throws Exception public void afterPropertiesSet() throws Exception
{ {
// isAvailable defaults to false afterPropertiesSet. It only becomes true on successful completion of this method. // isAvailable defaults to false afterPropertiesSet. It only becomes true on successful completion of this method.
this.isAvailable = false; this.isAvailable = false;
int[] portNumbers = getPortNumbers(); int[] portNumbers = getPortNumbers();
String officeHome = getOfficeHome(); String officeHome = getOfficeHome();
@ -308,6 +314,7 @@ public class JodConverterSharedInstance implements InitializingBean, DisposableB
logger.debug(" jodconverter.taskExecutionTimeout = " + taskExecutionTimeout); logger.debug(" jodconverter.taskExecutionTimeout = " + taskExecutionTimeout);
logger.debug(" jodconverter.taskQueueTimeout = " + taskQueueTimeout); logger.debug(" jodconverter.taskQueueTimeout = " + taskQueueTimeout);
logger.debug(" jodconverter.connectTimeout = " + connectTimeout); logger.debug(" jodconverter.connectTimeout = " + connectTimeout);
logger.debug(" jodconverter.url = " + url);
} }
// Only start the JodConverter instance(s) if the subsystem is enabled. // Only start the JodConverter instance(s) if the subsystem is enabled.
@ -316,71 +323,75 @@ public class JodConverterSharedInstance implements InitializingBean, DisposableB
return; return;
} }
logAllSofficeFilesUnderOfficeHome(); if (url == null || url.isEmpty())
{
try logAllSofficeFilesUnderOfficeHome();
{
DefaultOfficeManagerConfiguration defaultOfficeMgrConfig = new DefaultOfficeManagerConfiguration();
if (maxTasksPerProcess != null && maxTasksPerProcess > 0)
{
defaultOfficeMgrConfig.setMaxTasksPerProcess(maxTasksPerProcess);
}
if (officeHome != null)
{
defaultOfficeMgrConfig.setOfficeHome(officeHome);
}
if (portNumbers != null && portNumbers.length != 0)
{
defaultOfficeMgrConfig.setPortNumbers(portNumbers);
}
if (taskExecutionTimeout != null && taskExecutionTimeout > 0)
{
defaultOfficeMgrConfig.setTaskExecutionTimeout(taskExecutionTimeout);
}
if (taskQueueTimeout != null && taskQueueTimeout > 0)
{
defaultOfficeMgrConfig.setTaskQueueTimeout(taskQueueTimeout);
}
if (templateProfileDir != null)
{
defaultOfficeMgrConfig.setTemplateProfileDir(templateProfileDir);
}
if (connectTimeout != null)
{
defaultOfficeMgrConfig.setConnectTimeout(connectTimeout);
}
// Try to configure and start the JodConverter library.
officeManager = defaultOfficeMgrConfig.buildOfficeManager();
officeManager.start();
}
catch (IllegalStateException isx)
{
if (logger.isErrorEnabled())
{
logger.error("Unable to pre-initialise JodConverter library. "
+ "The following error is shown for informational purposes only.", isx);
}
return;
}
catch (OfficeException ox)
{
if (logger.isErrorEnabled())
{
logger.error("Unable to start JodConverter library. "
+ "The following error is shown for informational purposes only.", ox);
}
// We need to let it continue (comment-out return statement) even if an error occurs. See MNT-13706 and associated issues. try
//return;
}
catch (Exception x)
{
if (logger.isErrorEnabled())
{ {
logger.error("Unexpected error in configuring or starting the JodConverter library." DefaultOfficeManagerConfiguration defaultOfficeMgrConfig = new DefaultOfficeManagerConfiguration();
+ "The following error is shown for informational purposes only.",x); if (maxTasksPerProcess != null && maxTasksPerProcess > 0)
{
defaultOfficeMgrConfig.setMaxTasksPerProcess(maxTasksPerProcess);
}
if (officeHome != null && officeHome.length() != 0)
{
defaultOfficeMgrConfig.setOfficeHome(officeHome);
}
if (portNumbers != null && portNumbers.length != 0)
{
defaultOfficeMgrConfig.setPortNumbers(portNumbers);
}
if (taskExecutionTimeout != null && taskExecutionTimeout > 0)
{
defaultOfficeMgrConfig.setTaskExecutionTimeout(taskExecutionTimeout);
}
if (taskQueueTimeout != null && taskQueueTimeout > 0)
{
defaultOfficeMgrConfig.setTaskQueueTimeout(taskQueueTimeout);
}
if (templateProfileDir != null)
{
defaultOfficeMgrConfig.setTemplateProfileDir(templateProfileDir);
}
if (connectTimeout != null)
{
defaultOfficeMgrConfig.setConnectTimeout(connectTimeout);
}
// Try to configure and start the JodConverter library.
officeManager = defaultOfficeMgrConfig.buildOfficeManager();
officeManager.start();
}
catch (IllegalStateException isx)
{
if (logger.isErrorEnabled())
{
logger.error("Unable to pre-initialise JodConverter library. "
+ "The following error is shown for informational purposes only.", isx);
}
return;
}
catch (OfficeException ox)
{
if (logger.isErrorEnabled())
{
logger.error("Unable to start JodConverter library. "
+ "The following error is shown for informational purposes only.", ox);
}
// We need to let it continue (comment-out return statement) even if an error occurs. See MNT-13706 and associated issues.
//return;
}
catch (Exception x)
{
if (logger.isErrorEnabled())
{
logger.error("Unexpected error in configuring or starting the JodConverter library."
+ "The following error is shown for informational purposes only.", x);
}
return;
} }
return;
} }
// If any exceptions are thrown in the above code, then isAvailable // If any exceptions are thrown in the above code, then isAvailable
@ -407,62 +418,62 @@ public class JodConverterSharedInstance implements InitializingBean, DisposableB
private void logAllSofficeFilesUnderOfficeHome() private void logAllSofficeFilesUnderOfficeHome()
{ {
if (logger.isDebugEnabled() == false) if (logger.isDebugEnabled() == false)
{ {
return; return;
} }
String officeHome = getOfficeHome(); String officeHome = getOfficeHome();
File requestedOfficeHome = new File(officeHome); File requestedOfficeHome = new File(officeHome);
logger.debug("Some information on soffice* files and their permissions"); logger.debug("Some information on soffice* files and their permissions");
logFileInfo(requestedOfficeHome); logFileInfo(requestedOfficeHome);
for (File f : findSofficePrograms(requestedOfficeHome, new ArrayList<File>(), 2)) for (File f : findSofficePrograms(requestedOfficeHome, new ArrayList<File>(), 2))
{ {
logFileInfo(f); logFileInfo(f);
} }
} }
private List<File> findSofficePrograms(File searchRoot, List<File> results, int maxRecursionDepth) private List<File> findSofficePrograms(File searchRoot, List<File> results, int maxRecursionDepth)
{ {
return this.findSofficePrograms(searchRoot, results, 0, maxRecursionDepth); return this.findSofficePrograms(searchRoot, results, 0, maxRecursionDepth);
} }
private List<File> findSofficePrograms(File searchRoot, List<File> results, private List<File> findSofficePrograms(File searchRoot, List<File> results,
int currentRecursionDepth, int maxRecursionDepth) int currentRecursionDepth, int maxRecursionDepth)
{ {
if (currentRecursionDepth >= maxRecursionDepth) if (currentRecursionDepth >= maxRecursionDepth)
{ {
return results; return results;
} }
File[] matchingFiles = searchRoot.listFiles(new FilenameFilter() File[] matchingFiles = searchRoot.listFiles(new FilenameFilter()
{ {
@Override @Override
public boolean accept(File dir, String name) public boolean accept(File dir, String name)
{ {
return name.startsWith("soffice"); return name.startsWith("soffice");
} }
}); });
for (File f : matchingFiles) for (File f : matchingFiles)
{ {
results.add(f); results.add(f);
} }
for (File dir : searchRoot.listFiles(new FileFilter() for (File dir : searchRoot.listFiles(new FileFilter()
{ {
@Override @Override
public boolean accept(File f) { public boolean accept(File f) {
return f.isDirectory(); return f.isDirectory();
} }
})) }))
{ {
findSofficePrograms(dir, results, currentRecursionDepth + 1, maxRecursionDepth); findSofficePrograms(dir, results, currentRecursionDepth + 1, maxRecursionDepth);
} }
return results; return results;
} }
/** /**
@ -471,50 +482,50 @@ public class JodConverterSharedInstance implements InitializingBean, DisposableB
*/ */
private void logFileInfo(File f) private void logFileInfo(File f)
{ {
if (logger.isDebugEnabled() == false) if (logger.isDebugEnabled() == false)
{ {
return; return;
} }
StringBuilder msg = new StringBuilder(); StringBuilder msg = new StringBuilder();
msg.append(f).append(" "); msg.append(f).append(" ");
if (f.exists()) if (f.exists())
{ {
if (f.canRead()) if (f.canRead())
{ {
msg.append("(") msg.append("(")
.append(f.isDirectory() ? "d" : "-") .append(f.isDirectory() ? "d" : "-")
.append(f.canRead() ? "r" : "-") .append(f.canRead() ? "r" : "-")
.append(f.canWrite() ? "w" : "-") .append(f.canWrite() ? "w" : "-")
.append(f.canExecute() ? "x" : "-") .append(f.canExecute() ? "x" : "-")
.append(")"); .append(")");
} }
} }
else else
{ {
msg.append("does not exist"); msg.append("does not exist");
} }
logger.debug(msg.toString()); logger.debug(msg.toString());
} }
/* /*
* (non-Javadoc) * (non-Javadoc)
* @see org.springframework.beans.factory.DisposableBean#destroy() * @see org.springframework.beans.factory.DisposableBean#destroy()
*/ */
public void destroy() throws Exception { public void destroy() throws Exception {
this.isAvailable = false; this.isAvailable = false;
if (officeManager != null) if (officeManager != null)
{ {
// If there is an OfficeException when stopping the officeManager below, then there is // If there is an OfficeException when stopping the officeManager below, then there is
// little that can be done other than logging the exception and carrying on. The JodConverter-based // little that can be done other than logging the exception and carrying on. The JodConverter-based
// libraries will not be used in any case, as isAvailable is false. // libraries will not be used in any case, as isAvailable is false.
// //
// Any exception thrown out of this method will be logged and swallowed by Spring // Any exception thrown out of this method will be logged and swallowed by Spring
// (see javadoc for method declaration). Therefore there is no handling here for // (see javadoc for method declaration). Therefore there is no handling here for
// exceptions from jodConverter. // exceptions from jodConverter.
officeManager.stop(); officeManager.stop();
} }
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.alfresco.repo.content.JodConverterWorker#getOfficeManager() * @see org.alfresco.repo.content.JodConverterWorker#getOfficeManager()

6
alfresco-transformer-base/src/main/resources/application.properties
View File

@ -2,6 +2,6 @@ spring.http.multipart.max-file-size=8192MB
spring.http.multipart.max-request-size=8192MB spring.http.multipart.max-request-size=8192MB
server.port = 8090 server.port = 8090
logging.level.org.alfresco.util.exec.RuntimeExec=debug #logging.level.org.alfresco.util.exec.RuntimeExec=debug
logging.level.org.alfresco.transformer.LibreOfficeController=debug #logging.level.org.alfresco.transformer.LibreOfficeController=debug
logging.level.org.alfresco.transformer.JodConverterSharedInstance=debug #logging.level.org.alfresco.transformer.JodConverterSharedInstance=debug