From 11dc1406134a851a5f62051720789990791caf4b Mon Sep 17 00:00:00 2001 From: Jeff Burke Date: Fri, 4 Oct 2019 15:06:27 -0700 Subject: [PATCH 1/6] s2526 - add servlet name to DispatcherServlet info logging --- cadc-download-manager-server/build.gradle | 4 ++-- .../main/java/ca/nrc/cadc/dlm/server/DispatcherServlet.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cadc-download-manager-server/build.gradle b/cadc-download-manager-server/build.gradle index 303939d..3951b30 100644 --- a/cadc-download-manager-server/build.gradle +++ b/cadc-download-manager-server/build.gradle @@ -16,7 +16,7 @@ repositories { } } -version = '1.2' +version = '1.2.1' group = 'org.opencadc' sourceCompatibility = 1.7 @@ -35,4 +35,4 @@ dependencies { testCompile 'org.easymock:easymock:3.+' } -apply from: '../opencadc.gradle' \ No newline at end of file +apply from: '../opencadc.gradle' diff --git a/cadc-download-manager-server/src/main/java/ca/nrc/cadc/dlm/server/DispatcherServlet.java b/cadc-download-manager-server/src/main/java/ca/nrc/cadc/dlm/server/DispatcherServlet.java index 7031bc4..d9214c3 100644 --- a/cadc-download-manager-server/src/main/java/ca/nrc/cadc/dlm/server/DispatcherServlet.java +++ b/cadc-download-manager-server/src/main/java/ca/nrc/cadc/dlm/server/DispatcherServlet.java @@ -222,7 +222,7 @@ public static String getDownloadMethod(HttpServletRequest request, HttpServletRe @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - ServletLogInfo logInfo = new ServletLogInfo(request); + ServletLogInfo logInfo = new ServletLogInfo(request, this.getServletName()); log.info(logInfo.start()); long start = System.currentTimeMillis(); From f630d26c2ffbe576178fe4a5e6e6eea831586b6c Mon Sep 17 00:00:00 2001 From: Jeff Burke Date: Mon, 7 Oct 2019 12:12:58 -0700 Subject: [PATCH 2/6] s2526 - update build file --- cadc-download-manager/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cadc-download-manager/build.gradle b/cadc-download-manager/build.gradle index 227856d..4289147 100644 --- a/cadc-download-manager/build.gradle +++ b/cadc-download-manager/build.gradle @@ -21,8 +21,8 @@ mainClassName = 'ca.nrc.cadc.dlm.client.Main' dependencies { compile 'log4j:log4j:1.2.+' - compile 'org.opencadc:cadc-util:1.+' - compile 'org.opencadc:cadc-log:1.+' + compile 'org.opencadc:cadc-util:[1.2.25,)' + compile 'org.opencadc:cadc-log:[1.0.9,)' compile 'org.opencadc:cadc-registry:[1.1.1,)' compile 'org.opencadc:cadc-app-kit:1.+' compile 'org.opencadc:cadc-vos:[1.0,)' From e43e3336eff4db8e0958538ca995f67f6ac08363 Mon Sep 17 00:00:00 2001 From: Jeff Burke Date: Fri, 11 Oct 2019 13:36:37 -0700 Subject: [PATCH 3/6] s2526 - pass in the class to ServletLogInfo --- .../src/main/java/ca/nrc/cadc/dlm/server/DispatcherServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cadc-download-manager-server/src/main/java/ca/nrc/cadc/dlm/server/DispatcherServlet.java b/cadc-download-manager-server/src/main/java/ca/nrc/cadc/dlm/server/DispatcherServlet.java index d9214c3..c6ac1a2 100644 --- a/cadc-download-manager-server/src/main/java/ca/nrc/cadc/dlm/server/DispatcherServlet.java +++ b/cadc-download-manager-server/src/main/java/ca/nrc/cadc/dlm/server/DispatcherServlet.java @@ -222,7 +222,7 @@ public static String getDownloadMethod(HttpServletRequest request, HttpServletRe @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - ServletLogInfo logInfo = new ServletLogInfo(request, this.getServletName()); + ServletLogInfo logInfo = new ServletLogInfo(request, this.getClass()); log.info(logInfo.start()); long start = System.currentTimeMillis(); From ede5a80548eb85c3378f4b19b8932299caf214bd Mon Sep 17 00:00:00 2001 From: Jeff Burke Date: Thu, 31 Oct 2019 08:26:27 -0700 Subject: [PATCH 4/6] s2526 - update for ServletLogInfo constructor --- .../main/java/ca/nrc/cadc/dlm/server/DispatcherServlet.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cadc-download-manager-server/src/main/java/ca/nrc/cadc/dlm/server/DispatcherServlet.java b/cadc-download-manager-server/src/main/java/ca/nrc/cadc/dlm/server/DispatcherServlet.java index c6ac1a2..9893515 100644 --- a/cadc-download-manager-server/src/main/java/ca/nrc/cadc/dlm/server/DispatcherServlet.java +++ b/cadc-download-manager-server/src/main/java/ca/nrc/cadc/dlm/server/DispatcherServlet.java @@ -222,7 +222,8 @@ public static String getDownloadMethod(HttpServletRequest request, HttpServletRe @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - ServletLogInfo logInfo = new ServletLogInfo(request, this.getClass()); + ServletLogInfo logInfo = new ServletLogInfo(request); + logInfo.setClass(this.getClass()); log.info(logInfo.start()); long start = System.currentTimeMillis(); From 761282c7fa32661608c5077d0d2908204a9e7b0a Mon Sep 17 00:00:00 2001 From: Jeff Burke Date: Thu, 31 Oct 2019 13:17:06 -0700 Subject: [PATCH 5/6] s2526 - update cadc-log in new minor version --- cadc-download-manager-server/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cadc-download-manager-server/build.gradle b/cadc-download-manager-server/build.gradle index 3951b30..48bc5b7 100644 --- a/cadc-download-manager-server/build.gradle +++ b/cadc-download-manager-server/build.gradle @@ -25,7 +25,7 @@ dependencies { compile 'javax.servlet:javax.servlet-api:3.1.+' compile 'org.opencadc:cadc-util:1.+' - compile 'org.opencadc:cadc-log:1.+' + compile 'org.opencadc:cadc-log:[1.1.0,)' compile 'org.opencadc:cadc-registry:1.+' compile 'org.opencadc:cadc-app-kit:1.+' compile 'org.opencadc:cadc-download-manager:[1.1,)' From 4f86ecae5a0d59e0a736d47a6540258f4efca0b7 Mon Sep 17 00:00:00 2001 From: Jeff Burke Date: Tue, 5 Nov 2019 14:26:51 -0800 Subject: [PATCH 6/6] s2526 - remove setting the class for info logging --- .../src/main/java/ca/nrc/cadc/dlm/server/DispatcherServlet.java | 1 - 1 file changed, 1 deletion(-) diff --git a/cadc-download-manager-server/src/main/java/ca/nrc/cadc/dlm/server/DispatcherServlet.java b/cadc-download-manager-server/src/main/java/ca/nrc/cadc/dlm/server/DispatcherServlet.java index 9893515..7031bc4 100644 --- a/cadc-download-manager-server/src/main/java/ca/nrc/cadc/dlm/server/DispatcherServlet.java +++ b/cadc-download-manager-server/src/main/java/ca/nrc/cadc/dlm/server/DispatcherServlet.java @@ -223,7 +223,6 @@ public static String getDownloadMethod(HttpServletRequest request, HttpServletRe protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { ServletLogInfo logInfo = new ServletLogInfo(request); - logInfo.setClass(this.getClass()); log.info(logInfo.start()); long start = System.currentTimeMillis();