Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

 src/main/java/com/gitblit/GitBlitServer.java

@@ -217,22 +217,7 @@
      }

      logger = LoggerFactory.getLogger(GitBlitServer.class);
      logger.info(Constants.BORDER);
      logger.info("            _____  _  _    _      _  _  _");
      logger.info("           |  __ \\(_)| |  | |    | |(_)| |");
      logger.info("           | |  \\/ _ | |_ | |__  | | _ | |_");
      logger.info("           | | __ | || __|| '_ \\ | || || __|");
      logger.info("           | |_\\ \\| || |_ | |_) || || || |_");
      logger.info("            \\____/|_| \\__||_.__/ |_||_| \\__|");
      int spacing = (Constants.BORDER.length() - Constants.getGitBlitVersion().length()) / 2;
      StringBuilder sb = new StringBuilder();
      while (spacing > 0) {
         spacing--;
         sb.append(' ');
      }
      logger.info(sb.toString() + Constants.getGitBlitVersion());
      logger.info("");
      logger.info(Constants.BORDER);
      logger.info("\n" + Constants.getASCIIArt());

      System.setProperty("java.awt.headless", "true");

@@ -524,22 +509,25 @@

      @Override
      public void run() {
         logger.info("Shutdown Monitor listening on port " + socket.getLocalPort());
         Socket accept;
         try {
            accept = socket.accept();
            BufferedReader reader = new BufferedReader(new InputStreamReader(
                  accept.getInputStream()));
            reader.readLine();
            logger.info(Constants.BORDER);
            logger.info("Stopping " + Constants.NAME);
            logger.info(Constants.BORDER);
            server.stop();
            server.setStopAtShutdown(false);
            accept.close();
            socket.close();
         } catch (Exception e) {
            logger.warn("Failed to shutdown Jetty", e);
         // Only run if the socket was able to be created (not already in use, failed to bind, etc.)
         if (null != socket) {
            logger.info("Shutdown Monitor listening on port " + socket.getLocalPort());
            Socket accept;
            try {
               accept = socket.accept();
               BufferedReader reader = new BufferedReader(new InputStreamReader(
                     accept.getInputStream()));
               reader.readLine();
               logger.info(Constants.BORDER);
               logger.info("Stopping " + Constants.NAME);
               logger.info(Constants.BORDER);
               server.stop();
               server.setStopAtShutdown(false);
               accept.close();
               socket.close();
            } catch (Exception e) {
               logger.warn("Failed to shutdown Jetty", e);
            }
         }
      }
   }