Fixes #5 #7 Partial and aborted downloads will now be recorded

ESGF · Aug 13, 2015 · e9af67f · e9af67f
1 parent 9dc1e22
commit e9af67f
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/java/main/esg/node/filters/AccessLoggingFilter.java b/src/java/main/esg/node/filters/AccessLoggingFilter.java
@@ -395,7 +395,7 @@ public void doFilter(ServletRequest request,
                     long startTime = -1;
                     long dataSize = -1;
                     long byteCount = -1;
-                    boolean success = false;
+                    boolean success = true;
 
                     public void setRecordID(int id) { this.myID = id; }
                     public void setStartTime(long startTime) { this.startTime = startTime; }
@@ -407,7 +407,6 @@ public void setByteCount(long xferSize) {
                         System.out.println("**** setByteCount("+xferSize+")");
 
                         if((AccessLoggingFilter.this.accessLoggingDAO != null) && (myID > 0)) {
-                            if (dataSize == xferSize) { success = true; }
                             duration = System.currentTimeMillis() - startTime;
                             System.out.println("AccessLoggingFilter.this.accessLoggingDAO.logEgressInfo(myID: ["+myID+"], success: ["+success+"], duration: ["+duration+"]ms, dataSize ["+dataSize+"], xferSize: ["+xferSize+"] );");
                             AccessLoggingFilter.this.accessLoggingDAO.logEgressInfo(myID, success, duration, dataSize, xferSize);
@@ -420,10 +419,10 @@ public void setByteCount(long xferSize) {
             byteCountListener.setStartTime(System.currentTimeMillis());
             AccessLoggingResponseWrapper accessLoggingResponseWrapper = new AccessLoggingResponseWrapper((HttpServletResponse)response, byteCountListener);
             chain.doFilter(request, accessLoggingResponseWrapper);
+            accessLoggingResponseWrapper.stream.close();
         }catch(Throwable t) {
             log.error(t);
             HttpServletResponse resp = (HttpServletResponse)response;
-            resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Caught unforseen Exception in ESG Access Logging Filter (url may not be resolvable to an exisiting file) "+t.getMessage());
         }
     }