JWS-121 Added new refresher methods and the respective servlets and mappings entries...

diff --git a/WEB-INF/web.xml b/WEB-INF/web.xml
index f6b6daf..1519d57 100644 (file)
--- a/WEB-INF/web.xml
+++ b/WEB-INF/web.xml
@@ -61,6 +61,12 @@
                <servlet-class>compbio.stat.servlet.ServiceStatus</servlet-class>\r
        </servlet>\r
 \r
+       <servlet>\r
+               <description>WebServices Status</description>\r
+               <servlet-name>ServiceStatusRefresher</servlet-name>\r
+               <servlet-class>compbio.stat.servlet.ServiceStatusRefresher</servlet-class>\r
+       </servlet>\r
+\r
        <!--<servlet>-->\r
                <!--<servlet-name>DownloadRedirector</servlet-name>-->\r
                <!--<servlet-class>compbio.stat.servlet.DownloadRedirector</servlet-class>-->\r
@@ -91,6 +97,12 @@
        </servlet>\r
 \r
        <servlet>\r
+               <description>Display monthly summary statistics with no links to details</description>\r
+               <servlet-name>PublicAnnualStatRefresher</servlet-name>\r
+               <servlet-class>compbio.stat.servlet.AnnualStatRefresher</servlet-class>\r
+       </servlet>\r
+\r
+       <servlet>\r
                <servlet-name>RegistryWS</servlet-name>\r
                <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>\r
                <load-on-startup>1</load-on-startup>\r
@@ -207,6 +219,11 @@
        </servlet-mapping>\r
 \r
        <servlet-mapping>\r
+               <servlet-name>ServiceStatusRefresher</servlet-name>\r
+               <url-pattern>/ServiceStatusRefresher</url-pattern>\r
+       </servlet-mapping>\r
+\r
+       <servlet-mapping>\r
                <servlet-name>HttpCodeResponseServiceStatus</servlet-name>\r
                <url-pattern>/HttpCodeResponseServiceStatus/*</url-pattern>\r
        </servlet-mapping>\r
@@ -222,6 +239,11 @@
        </servlet-mapping>\r
 \r
        <servlet-mapping>\r
+               <servlet-name>PublicAnnualStatRefresher</servlet-name>\r
+               <url-pattern>/PublicAnnualStatRefresher</url-pattern>\r
+       </servlet-mapping>\r
+\r
+       <servlet-mapping>\r
                <servlet-name>Joblist</servlet-name>\r
                <url-pattern>/Joblist</url-pattern>\r
        </servlet-mapping>\r

diff --git a/webservices/compbio/stat/servlet/AnnualStatRefresher.java b/webservices/compbio/stat/servlet/AnnualStatRefresher.java
new file mode 100644 (file)
index 0000000..28a10c0
--- /dev/null
+++ b/webservices/compbio/stat/servlet/AnnualStatRefresher.java
@@ -0,0 +1,65 @@
+/* Copyright (c) 2017 Fabio Madeira
+ *
+ *  JAva Bioinformatics Analysis Web Services (JABAWS) @version: 2.0
+ *
+ *  This library is free software; you can redistribute it and/or modify it under the terms of the
+ *  Apache License version 2 as published by the Apache Software Foundation
+ *
+ *  This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ *  even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Apache
+ *  License for more details.
+ *
+ *  A copy of the license is in apache_license.txt. It is also available here:
+ * @see: http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ * Any republication or derived work distributed in source code form
+ * must include this copyright and license notice.
+ */
+
+package compbio.stat.servlet;
+
+import compbio.stat.servlet.util.Totals;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Map;
+
+public class AnnualStatRefresher extends AnnualStat {
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+            throws ServletException, IOException {
+
+        Map<Date, Totals> monthlyTotals;
+        String timeStamp = new String();
+        long startTime;
+        long endTime;
+
+        // get stats from db
+        startTime = System.nanoTime();
+        monthlyTotals = checkMonthlyTotals(resp);
+        endTime = System.nanoTime();
+        if (monthlyTotals != null) {
+            // try clear the previous values if any
+            clearContextCache();
+            // add the current values to the context
+            this.getServletConfig().getServletContext().setAttribute("usageStatsResults", monthlyTotals);
+            timeStamp = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(
+                    Calendar.getInstance().getTime());
+            this.getServletConfig().getServletContext().setAttribute("usageStatsTimestamp", timeStamp);
+            this.getServletConfig().getServletContext().setAttribute("usageStatsStart", startTime);
+            this.getServletConfig().getServletContext().setAttribute("usageStatsEnd", endTime);
+        } else {
+            return;
+        }
+
+        resp.sendRedirect("PublicAnnualStat");
+
+    }
+
+}
\ No newline at end of file

diff --git a/webservices/compbio/stat/servlet/ServiceStatusRefresher.java b/webservices/compbio/stat/servlet/ServiceStatusRefresher.java
new file mode 100644 (file)
index 0000000..5240648
--- /dev/null
+++ b/webservices/compbio/stat/servlet/ServiceStatusRefresher.java
@@ -0,0 +1,68 @@
+/* Copyright (c) 2017 Fabio Madeira
+ *
+ *  JAva Bioinformatics Analysis Web Services (JABAWS) @version: 2.0
+ *
+ *  This library is free software; you can redistribute it and/or modify it under the terms of the
+ *  Apache License version 2 as published by the Apache Software Foundation
+ *
+ *  This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ *  even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Apache
+ *  License for more details.
+ *
+ *  A copy of the license is in apache_license.txt. It is also available here:
+ * @see: http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ * Any republication or derived work distributed in source code form
+ * must include this copyright and license notice.
+ */
+
+package compbio.stat.servlet;
+
+import java.io.IOException;
+import java.util.*;
+import java.text.SimpleDateFormat;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+public class ServiceStatusRefresher extends ServiceStatus {
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        /**
+         * // PROBLEM: the code tries to test not WS endpoints on an internal
+         * Tomcat, but on an external // endpoints with wrong info on the
+         * proxing StringBuffer jabawspath = req.getRequestURL(); jabawspath =
+         * jabawspath.delete(jabawspath.lastIndexOf("/"), jabawspath.length());
+         * String serverPath = jabawspath.toString();
+         */
+
+        ArrayList<ServiceTestResult> testResults = new ArrayList<ServiceTestResult>();
+        String timeStamp = new String();
+        long startTime;
+        long endTime;
+        String goodStatus;
+
+        // test the services and timeit
+        startTime = System.nanoTime();
+        testResults = testServiceStatus(req);
+        endTime = System.nanoTime();
+        // try clear the previous values if any
+        clearContextCache();
+        // add the current values to the context
+        this.getServletConfig().getServletContext().setAttribute("serviceStatusResults", testResults);
+        timeStamp = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(
+                Calendar.getInstance().getTime());
+        this.getServletConfig().getServletContext().setAttribute("serviceStatusTimestamp", timeStamp);
+        this.getServletConfig().getServletContext().setAttribute("serviceStatusStart", startTime);
+        this.getServletConfig().getServletContext().setAttribute("serviceStatusEnd", endTime);
+        goodStatus = overallStatusGood(testResults);
+        this.getServletConfig().getServletContext().setAttribute("serviceStatusAllGood", goodStatus);
+
+        resp.sendRedirect("ServiceStatus");
+
+    }
+
+}