|
18 | 18 | */
|
19 | 19 |
|
20 | 20 | /*
|
21 |
| - * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved. |
| 21 | + * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. |
22 | 22 | */
|
23 | 23 | package org.opensolaris.opengrok.web;
|
24 | 24 |
|
|
37 | 37 | import javax.servlet.ServletRequestEvent;
|
38 | 38 | import javax.servlet.ServletRequestListener;
|
39 | 39 | import org.json.simple.parser.ParseException;
|
| 40 | +import org.opensolaris.opengrok.Info; |
40 | 41 | import org.opensolaris.opengrok.authorization.AuthorizationFramework;
|
41 | 42 | import org.opensolaris.opengrok.configuration.RuntimeEnvironment;
|
42 | 43 | import org.opensolaris.opengrok.logger.LoggerFactory;
|
@@ -64,6 +65,9 @@ public void contextInitialized(final ServletContextEvent servletContextEvent) {
|
64 | 65 | ServletContext context = servletContextEvent.getServletContext();
|
65 | 66 | RuntimeEnvironment env = RuntimeEnvironment.getInstance();
|
66 | 67 |
|
| 68 | + LOGGER.log(Level.INFO, "Starting webapp with version {0} ({1})", |
| 69 | + new Object[]{ Info.getVersion(), Info.getRevision()}); |
| 70 | + |
67 | 71 | String config = context.getInitParameter("CONFIGURATION");
|
68 | 72 | if (config == null) {
|
69 | 73 | LOGGER.severe("CONFIGURATION section missing in web.xml");
|
@@ -91,10 +95,10 @@ public void contextInitialized(final ServletContextEvent servletContextEvent) {
|
91 | 95 | try {
|
92 | 96 | SocketAddress addr = new InetSocketAddress(InetAddress.getByName(cfg[0]), Integer.parseInt(cfg[1]));
|
93 | 97 | if (!RuntimeEnvironment.getInstance().startConfigurationListenerThread(addr)) {
|
94 |
| - LOGGER.log(Level.SEVERE, "OpenGrok: Failed to start configuration listener thread"); |
| 98 | + LOGGER.log(Level.SEVERE, "Failed to start configuration listener thread"); |
95 | 99 | }
|
96 | 100 | } catch (NumberFormatException | UnknownHostException ex) {
|
97 |
| - LOGGER.log(Level.SEVERE, "OpenGrok: Failed to start configuration listener thread:", ex); |
| 101 | + LOGGER.log(Level.SEVERE, "Failed to start configuration listener thread:", ex); |
98 | 102 | }
|
99 | 103 | } else {
|
100 | 104 | LOGGER.log(Level.SEVERE, "Incorrect format for the configuration address: ");
|
|
0 commit comments