Repository: apex-core Updated Branches: refs/heads/master b4bc94d09 -> 9e89de445
APEXCORE-466 #resolve improved logging from the *Agent.java files Project: http://git-wip-us.apache.org/repos/asf/apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/apex-core/commit/205ac46d Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/205ac46d Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/205ac46d Branch: refs/heads/master Commit: 205ac46d7b3b50516bbf971974bef8f7004f881a Parents: ae46b47 Author: David Yan <[email protected]> Authored: Fri May 20 15:04:56 2016 -0700 Committer: David Yan <[email protected]> Committed: Fri Jun 3 17:13:56 2016 -0700 ---------------------------------------------------------------------- .../java/com/datatorrent/stram/client/EventsAgent.java | 8 ++++---- .../com/datatorrent/stram/client/RecordingsAgent.java | 12 ++++++------ .../java/com/datatorrent/stram/client/StramAgent.java | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/apex-core/blob/205ac46d/engine/src/main/java/com/datatorrent/stram/client/EventsAgent.java ---------------------------------------------------------------------- diff --git a/engine/src/main/java/com/datatorrent/stram/client/EventsAgent.java b/engine/src/main/java/com/datatorrent/stram/client/EventsAgent.java index f57c59a..f2a0058 100644 --- a/engine/src/main/java/com/datatorrent/stram/client/EventsAgent.java +++ b/engine/src/main/java/com/datatorrent/stram/client/EventsAgent.java @@ -125,7 +125,7 @@ public final class EventsAgent extends FSPartFileAgent totalNumEvents += indexLine.numEvents; } } catch (Exception ex) { - LOG.warn("Got exception when reading events", ex); + LOG.warn("Cannot read events for {}: {}", appId, ex); return result; } long offset = 0; @@ -145,7 +145,7 @@ public final class EventsAgent extends FSPartFileAgent offset = 0; lastProcessPartFile = partFile.first; } catch (Exception ex) { - LOG.warn("Got exception when reading events", ex); + LOG.warn("Cannot read events for {}: {}", appId, ex); } } @@ -214,7 +214,7 @@ public final class EventsAgent extends FSPartFileAgent IOUtils.closeQuietly(partBr); } } catch (Exception ex) { - LOG.warn("Got exception when reading events", ex); + LOG.warn("Cannot read events for {}: {}", appId, ex); } return result; @@ -239,7 +239,7 @@ public final class EventsAgent extends FSPartFileAgent offset--; } else if (limit-- > 0) { ev.data = new ObjectMapper().readValue(partLine.substring(cursor), HashMap.class); - ev.id = Long.valueOf((String)ev.data.get("id")); + ev.id = Long.valueOf(ev.data.get("id")); ev.data.remove("id"); result.add(ev); } http://git-wip-us.apache.org/repos/asf/apex-core/blob/205ac46d/engine/src/main/java/com/datatorrent/stram/client/RecordingsAgent.java ---------------------------------------------------------------------- diff --git a/engine/src/main/java/com/datatorrent/stram/client/RecordingsAgent.java b/engine/src/main/java/com/datatorrent/stram/client/RecordingsAgent.java index 47a3b4b..aee5c59 100644 --- a/engine/src/main/java/com/datatorrent/stram/client/RecordingsAgent.java +++ b/engine/src/main/java/com/datatorrent/stram/client/RecordingsAgent.java @@ -273,7 +273,7 @@ public final class RecordingsAgent extends FSPartFileAgent } } } catch (IOException ex) { - LOG.warn("Got exception when getting recording info", ex); + LOG.warn("Cannot get recording info for app id {}: {}", appId, ex); return result; } @@ -316,7 +316,7 @@ public final class RecordingsAgent extends FSPartFileAgent } } } catch (IOException ex) { - LOG.warn("Got exception when getting recording info", ex); + LOG.warn("Cannot get recording info for app id {}: {}", appId, ex); return result; } @@ -431,7 +431,7 @@ public final class RecordingsAgent extends FSPartFileAgent range.high = prevHiWindowId; } } catch (Exception ex) { - LOG.warn("Got exception when getting recording info", ex); + LOG.warn("Cannot get recording info for app id {}: {}", appId, ex); return null; } finally { IOUtils.closeQuietly(ifbr); @@ -543,7 +543,7 @@ public final class RecordingsAgent extends FSPartFileAgent } } catch (Exception ex) { - LOG.warn("Got exception when getting tuples info", ex); + LOG.warn("Cannot get recording tuple info for app id {}: {}", appId, ex); return null; } @@ -640,7 +640,7 @@ public final class RecordingsAgent extends FSPartFileAgent } ); } catch (Exception ex) { - LOG.error("Exception caught", ex); + LOG.error("Cannot start recording: ", ex); return null; } } @@ -668,7 +668,7 @@ public final class RecordingsAgent extends FSPartFileAgent } ); } catch (Exception ex) { - LOG.error("Exception caught", ex); + LOG.error("Cannot stop recording: ", ex); return null; } } http://git-wip-us.apache.org/repos/asf/apex-core/blob/205ac46d/engine/src/main/java/com/datatorrent/stram/client/StramAgent.java ---------------------------------------------------------------------- diff --git a/engine/src/main/java/com/datatorrent/stram/client/StramAgent.java b/engine/src/main/java/com/datatorrent/stram/client/StramAgent.java index 7acd232..1e38ef2 100644 --- a/engine/src/main/java/com/datatorrent/stram/client/StramAgent.java +++ b/engine/src/main/java/com/datatorrent/stram/client/StramAgent.java @@ -356,7 +356,7 @@ public class StramAgent extends FSAgent } url += WebServices.PATH; } catch (Exception ex) { - LOG.error("Caught exception when retrieving web services info", ex); + LOG.error("Cannot retrieve web services info", ex); return null; } finally { yarnClient.stop(); @@ -418,7 +418,7 @@ public class StramAgent extends FSAgent } return new StramWebServicesInfo(appMasterUrl, version, appPath, user, secToken, permissionsInfo); } catch (Exception ex) { - LOG.warn("Caught exception when retrieving web service info for app {}", appId, ex); + LOG.warn("Cannot retrieve web service info for app {}", appId, ex); return null; } }
