Merge pull request #254 from rysteboe/JENKINS-49472

[JENKINS-49472] Log channel name if command not constructed
jenkinsci · Feb 9, 2018 · 563bff8 · 563bff8
2 parents 8a22d34 + c967331
commit 563bff8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/main/java/hudson/remoting/AbstractByteArrayCommandTransport.java b/src/main/java/hudson/remoting/AbstractByteArrayCommandTransport.java
@@ -63,10 +63,8 @@ public void handle(byte[] payload) {
                             new ByteArrayInputStream(payload),channel.baseClassLoader,channel.classFilter));
                     receiver.handle(cmd);
                     channel.notifyRead(cmd, payload.length);
-                } catch (IOException e) {
-                    LOGGER.log(Level.WARNING, "Failed to construct Command", e);
-                } catch (ClassNotFoundException e) {
-                    LOGGER.log(Level.WARNING, "Failed to construct Command", e);
+                } catch (IOException | ClassNotFoundException e) {
+                    LOGGER.log(Level.WARNING, "Failed to construct Command in channel " + channel.getName(), e);
                 }
             }
 

diff --git a/src/main/java/hudson/remoting/AbstractByteBufferCommandTransport.java b/src/main/java/hudson/remoting/AbstractByteBufferCommandTransport.java
@@ -202,10 +202,8 @@ private void processCommand() throws IOException {
                 Command cmd = Command.readFrom(channel, ois);
                 receiver.handle(cmd);
                 channel.notifyRead(cmd, readCommandSizes[0]);
-            } catch (IOException e1) {
-                LOGGER.log(Level.WARNING, "Failed to construct Command", e1);
-            } catch (ClassNotFoundException e11) {
-                LOGGER.log(Level.WARNING, "Failed to construct Command", e11);
+            } catch (IOException | ClassNotFoundException e) {
+                LOGGER.log(Level.WARNING, "Failed to construct Command in channel " + channel.getName(), e);
             } finally {
                 int available = is.available();
                 if (available > 0) {