Github user mikewalch commented on a diff in the pull request:
https://github.com/apache/accumulo/pull/242#discussion_r110013733
--- Diff:
server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
---
@@ -1,285 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.monitor.servlets;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.util.Date;
-import java.util.List;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.accumulo.core.Constants;
-import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.monitor.Monitor;
-import org.apache.accumulo.server.monitor.DedupedLogEvent;
-import org.apache.accumulo.server.monitor.LogService;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-
-abstract public class BasicServlet extends HttpServlet {
- public static final String STANDBY_MONITOR_MESSAGE = "This is not the
active Monitor";
-
- private static final long serialVersionUID = 1L;
- protected static final Logger log = Logger.getLogger(BasicServlet.class);
- private String bannerText;
- private String bannerColor;
- private String bannerBackground;
-
- abstract protected String getTitle(HttpServletRequest req);
-
- public boolean isActiveMonitor() {
- // If the HighlyAvailableService is not initialized or it's not the
active service, throw an exception
- // to prevent processing of the servlet.
- if (null == Monitor.HA_SERVICE_INSTANCE ||
!Monitor.HA_SERVICE_INSTANCE.isActiveService()) {
- return false;
- }
- return true;
- }
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- // Verify that this is the active Monitor instance
- if (!isActiveMonitor()) {
- resp.sendError(HttpURLConnection.HTTP_UNAVAILABLE,
STANDBY_MONITOR_MESSAGE);
- return;
- }
- StringBuilder sb = new StringBuilder();
- try {
- Monitor.fetchData();
- bannerText =
sanitize(Monitor.getContext().getConfiguration().get(Property.MONITOR_BANNER_TEXT));
--- End diff --
The three monitor banner configuration properties in this file should be
deprecated in the `Property` class.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
