From 413a29e17f2ef32ec337720c33cc3b5a4ea898fa Mon Sep 17 00:00:00 2001 From: "giancarlo.panichi" Date: Wed, 11 Apr 2018 09:20:07 +0000 Subject: [PATCH] ref 11259:Accounting Manager portlet: lower log level of o.g.p.a.a.s.SessionUtil https://support.d4science.org/issues/11259 Updated log level to debug git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/accounting-manager@165843 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/AccountingClientCallable.java | 4 ++-- .../server/AccountingClientDaemon.java | 2 +- .../server/AccountingClientListener.java | 14 +++++++------- .../accountingmanager/server/ExportServlet.java | 2 +- .../accountingmanager/server/SessionUtil.java | 4 ++-- .../server/amservice/AccountingCaller.java | 2 +- .../server/amservice/cache/AccountingCache.java | 2 +- .../server/is/BuildEnableTabs.java | 2 +- .../server/is/BuildThreadPoolInfo.java | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientCallable.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientCallable.java index d266c6f..20c5dc2 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientCallable.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientCallable.java @@ -56,11 +56,11 @@ public class AccountingClientCallable implements Callable { if (Constants.DEBUG_MODE) { accountingCaller = new AccountingCallerTester(); } else { - logger.info("Set SecurityToken: " + logger.debug("Set SecurityToken: " + taskRequest.getServiceCredentials().getToken()); SecurityTokenProvider.instance.set(taskRequest .getServiceCredentials().getToken()); - logger.info("Set ScopeProvider: " + logger.debug("Set ScopeProvider: " + taskRequest.getServiceCredentials().getScope()); ScopeProvider.instance.set(taskRequest.getServiceCredentials() .getScope()); diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientDaemon.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientDaemon.java index 71d1edd..628d8e4 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientDaemon.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientDaemon.java @@ -101,7 +101,7 @@ public class AccountingClientDaemon implements Runnable { try { result = futureResult.get(timeout, TimeUnit.MILLISECONDS); - logger.info("AccountingClientTask: " + result); + logger.debug("AccountingClientTask: " + result); } catch (InterruptedException | ExecutionException e) { logger.error( diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientListener.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientListener.java index 61c0621..597a372 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientListener.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientListener.java @@ -28,7 +28,7 @@ public class AccountingClientListener implements ServletContextListener { @Override public void contextInitialized(ServletContextEvent sce) { - logger.info("Initializing AccountingCache"); + logger.debug("Initializing AccountingCache"); accountingCache = null; try { accountingCache = new AccountingCache(); @@ -40,31 +40,31 @@ public class AccountingClientListener implements ServletContextListener { sce.getServletContext().setAttribute(SessionConstants.ACCOUNTING_CACHE, accountingCache); - logger.info("AccountingCache value saved in context."); + logger.debug("AccountingCache value saved in context."); accountingClientDaemon = new AccountingClientDaemon(sce, accountingCache); thread = new Thread(accountingClientDaemon); - logger.info("Starting AccountingClientDaemon: " + thread); + logger.debug("Starting AccountingClientDaemon: " + thread); thread.start(); logger.info("AccountingClientDaemon process successfully started."); } @Override public void contextDestroyed(ServletContextEvent sce) { - logger.info("Stopping AccountingClientDaemon: " + thread); + logger.debug("Stopping AccountingClientDaemon: " + thread); if (thread != null) { accountingClientDaemon.terminate(); try { thread.join(); } catch (InterruptedException e) { } - logger.info("AccountingClientDaemon successfully stopped."); + logger.debug("AccountingClientDaemon successfully stopped."); } - logger.info("Clear AccountingCache"); + logger.debug("Clear AccountingCache"); try { accountingCache.finalize(); - logger.info("AccountingCache finelized"); + logger.debug("AccountingCache finelized"); } catch (Throwable e) { logger.error( "Error in finalize AccountingCache: " diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/ExportServlet.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/ExportServlet.java index 5810fb8..a9a7bf8 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/ExportServlet.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/ExportServlet.java @@ -65,7 +65,7 @@ public class ExportServlet extends HttpServlet { private void createResponse(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { try { - logger.info("ExportServlet"); + logger.debug("ExportServlet"); HttpSession session = request.getSession(); diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionUtil.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionUtil.java index 5c078a6..8e1b506 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionUtil.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionUtil.java @@ -53,7 +53,7 @@ public class SessionUtil { String groupName = null; if (Constants.DEBUG_MODE) { - logger.info("No credential found in session, use test user!"); + logger.debug("No credential found in session, use test user!"); userName = Constants.DEFAULT_USER; scope = Constants.DEFAULT_SCOPE; token = Constants.DEFAULT_TOKEN; @@ -61,7 +61,7 @@ public class SessionUtil { sCredentials = new ServiceCredentials(userName, scope, token); } else { - logger.info("Retrieving credential in session!"); + logger.debug("Retrieving credential in session!"); PortalContext pContext = PortalContext.getConfiguration(); boolean hasScopeGroupId = false; // boolean hasCurrUserId = false; diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCaller.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCaller.java index d6c1b82..76156fc 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCaller.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCaller.java @@ -84,7 +84,7 @@ public class AccountingCaller implements AccountingCallerInterface { director.constructAccountingQuery(); AccountingQuery query = director.getAccountingQuery(); - logger.info("AccountingQuery: " + query); + logger.debug("AccountingQuery: " + query); if (query == null || query.getChartType() == null) { throw new ServiceException( diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/cache/AccountingCache.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/cache/AccountingCache.java index a901516..d509d38 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/cache/AccountingCache.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/cache/AccountingCache.java @@ -55,7 +55,7 @@ public class AccountingCache implements Serializable { // Resolve a cache manager CachingProvider cachingProvider = Caching.getCachingProvider(); cacheManager = cachingProvider.getCacheManager(); - logger.info("AccountingCache URI: " + cacheManager.getURI()); + logger.debug("AccountingCache URI: " + cacheManager.getURI()); ResourcePoolsBuilder builderSeries = ResourcePoolsBuilder.newResourcePoolsBuilder().heap(SERIES_HEAP_DIMENSION_MB, MemoryUnit.MB) .offheap(SERIES_OFFHEAP_DIMENSION_MB, MemoryUnit.MB); diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/BuildEnableTabs.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/BuildEnableTabs.java index 6cf7674..db33c3b 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/BuildEnableTabs.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/BuildEnableTabs.java @@ -39,7 +39,7 @@ public class BuildEnableTabs { enableTabsJAXB = InformationSystemUtils .retrieveEnableTab(scope); } catch (ServiceException e) { - logger.info(e.getLocalizedMessage()); + logger.debug(e.getLocalizedMessage(),e); } logger.debug("Enable Tabs: " + enableTabsJAXB); diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/BuildThreadPoolInfo.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/BuildThreadPoolInfo.java index 706ca18..47412a8 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/BuildThreadPoolInfo.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/BuildThreadPoolInfo.java @@ -21,7 +21,7 @@ public class BuildThreadPoolInfo { ThreadPoolInfo threadPoolInfo=null; if (Constants.DEBUG_MODE) { - logger.info("AccountingManager use default configuration for threadpool [scope="+scope+"]"); + logger.debug("AccountingManager use default configuration for threadpool [scope="+scope+"]"); threadPoolInfo=new ThreadPoolInfo(Constants.SERVICE_CLIENT_TIMEOUT_DEFAULT_MILLIS); } else { ThreadPoolJAXB threadPoolJAXB=null; @@ -29,7 +29,7 @@ public class BuildThreadPoolInfo { threadPoolJAXB= InformationSystemUtils .retrieveThreadPoolTimeout(scope); } catch(ServiceException e){ - logger.info(e.getLocalizedMessage()); + logger.debug(e.getLocalizedMessage()); } logger.debug("ThreadPool: " + threadPoolJAXB);