| commit | 7f2acb65a4498116b1ed92615d786fe84df22491 | [log] [tgz] |
|---|---|---|
| author | slowr <dimitris@opennetworking.org> | Tue Jan 16 22:29:40 2018 +0200 |
| committer | slowr <dimitris@opennetworking.org> | Tue Jan 16 22:29:40 2018 +0200 |
| tree | 6d1585abe7c2effe8239c0f8d59fa922c54df40e | |
| parent | 002258f0253e45978e4d342f5eade4349dd196e3 [diff] | |
| parent | 56cb6f239230451b6dda290f15ffe3513078fbff [diff] |
Merge branch 'master' of ssh://gerrit.opencord.org:29418/fpcagent Conflicts: apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/JettyServer.java apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/ParseStream.java
diff --git a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/EventClient.java b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/EventClient.java index 664d9d9..88b0201 100644 --- a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/EventClient.java +++ b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/EventClient.java
@@ -40,6 +40,7 @@ */ public void connectToClient(String uri) { this.clientUri = uri; + log.info("here connectToClient"); try { client.start(); HttpAsyncRequestProducer get = HttpAsyncMethods.createGet(this.clientUri);
diff --git a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/EventServer.java b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/EventServer.java index 3313188..ddb7426 100644 --- a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/EventServer.java +++ b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/EventServer.java
@@ -66,6 +66,7 @@ } protected void doPost(HttpServletRequest request, HttpServletResponse response) { + log.info("here doPost"); try { String clientUri = null; StringBuffer jsonStringBuilder = new StringBuffer(); @@ -75,7 +76,7 @@ while ((line = br.readLine()) != null) jsonStringBuilder.append(line); } catch (Exception e) { - e.printStackTrace(); + log.error(ExceptionUtils.getFullStackTrace(e)); } try {
diff --git a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/NBEventWorkerManager.java b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/NBEventWorkerManager.java index 3397bd6..16c8caf 100644 --- a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/NBEventWorkerManager.java +++ b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/NBEventWorkerManager.java
@@ -149,3 +149,4 @@ this.run = false; } } +