Check validateUniversalCtags() from web too

Author: idodeclare

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/Ctags.java

@@ -148,6 +148,11 @@ public List<String> getArgv() {
     }
 
     private void initialize() {
+        /*
+         * Call the following principally to properly initialize when running
+         * JUnit tests. opengrok-indexer and opengrok-web call it too but
+         * validating its return code and logging (and possibly aborting).
+         */
         env.validateUniversalCtags();
 
         command = new ArrayList<>();

opengrok-web/src/main/java/org/opengrok/web/WebappListener.java

@@ -19,7 +19,7 @@
 
 /*
  * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright (c) 2018, Chris Fraire <cfraire@me.com>.
+ * Portions Copyright (c) 2018-2019, Chris Fraire <cfraire@me.com>.
  */
 package org.opengrok.web;
 
@@ -77,14 +77,18 @@ public void contextInitialized(final ServletContextEvent servletContextEvent) {
             }
         }
 
-        /**
+        /*
          * Create a new instance of authorization framework. If the code above
          * (reading the configuration) failed then the plugin directory is
          * possibly {@code null} causing the framework to allow every request.
          */
         env.setAuthorizationFramework(new AuthorizationFramework(env.getPluginDirectory(), env.getPluginStack()));
         env.getAuthorizationFramework().reload();
 
+        if (env.isWebappCtags() && !env.validateUniversalCtags()) {
+            LOGGER.warning("Didn't find Universal Ctags for --webappCtags");
+        }
+
         try {
             loadStatistics();
         } catch (IOException ex) {
@@ -93,7 +97,7 @@ public void contextInitialized(final ServletContextEvent servletContextEvent) {
 
         String pluginDirectory = env.getPluginDirectory();
         if (pluginDirectory != null && env.isAuthorizationWatchdog()) {
-            RuntimeEnvironment.getInstance().watchDog.start(new File(pluginDirectory));
+            env.watchDog.start(new File(pluginDirectory));
         }
 
         env.startExpirationTimer();