dcap: do not log client disconnects

if client does not send CLOSE and disconnects, then faimost "EOF on input socket (fillBuffer)" is loggeed. Acked-by: Paul Millar Patch: http://rb.dcache.org/r/4554/
dCache · Jun 13, 2012 · f6df217 · f6df217
1 parent 3b04b88
commit f6df217
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/modules/dcache-dcap/src/main/java/org/dcache/pool/movers/DCapProtocol_3_nio.java b/modules/dcache-dcap/src/main/java/org/dcache/pool/movers/DCapProtocol_3_nio.java
@@ -459,9 +459,8 @@ public void runIO(RepositoryChannel  fileChannel,
                     _log.debug("Request Block : {}", requestBlock);
 
                 }catch(EOFException eofe){
-                    _log.error("Dataconnection closed by peer : {}", eofe.toString());
+                    _log.debug("Dataconnection closed by peer : {}", eofe.toString());
                     throw eofe;
-
                 }catch(BufferUnderflowException bue){
                     throw new
                         CacheException(43,"Protocol Violation (csl<4)");
@@ -756,7 +755,6 @@ public void runIO(RepositoryChannel  fileChannel,
             _log.error("Problem in command block : "+requestBlock, e);
             ioException = e;
         }catch(Exception e){
-            _log.warn("Problem in command block : "+requestBlock, e.toString());
             ioException = e;
         }finally{
 
@@ -804,7 +802,10 @@ public void runIO(RepositoryChannel  fileChannel,
                                    "Disk I/O Error " +
                                    (ioException!=null?ioException.toString():"")    );
             }else{
-                if (ioException instanceof EOFException)  throw ioException;
+                if (ioException != null && !(ioException instanceof EOFException)) {
+                     _log.warn("Problem in command block : {} {}", requestBlock, ioException.toString());
+                    throw ioException;
+                }
             }