- lower timeout timer for validation

- change location of preschecker
joshua-arts · Sep 26, 2017 · 9d9df0e · 9d9df0e
1 parent 67eb305
commit 9d9df0e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentValidator2.java b/...common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentValidator2.java
@@ -22,7 +22,7 @@ public boolean isValid(UploadedPresentation pres) {
     boolean valid = true;
 
     if (FilenameUtils.isExtension(pres.getUploadedFile().getName(), FileTypeConstants.PPTX)) {
-      String COMMAND = presCheckExec + " " + pres.getUploadedFile().getAbsolutePath();
+      String COMMAND = "timeout 20 " + presCheckExec + " " + pres.getUploadedFile().getAbsolutePath();
 
       log.info("Running pres check " + COMMAND);
 

diff --git a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
@@ -41,7 +41,7 @@ fontsDir=/usr/share/fonts
 
 #----------------------------------------------------
 # Executable for presentation checker
-presCheckExec=/usr/local/bigbluebutton/prescheck/prescheck.sh
+presCheckExec=/usr/share/prescheck/prescheck.sh
 
 
 #----------------------------------------------------