From dd4f0788187a3d80cf3e6ffaa8f5a3c446e23715 Mon Sep 17 00:00:00 2001 From: "panagiota.koltsida" Date: Fri, 1 Mar 2013 12:06:05 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/application-support-layer/applicationSupportLayerCore@70645 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../framework/core/session/ASLSession.java | 16 ++++------------ .../framework/core/session/Notifier.java | 2 +- .../framework/core/session/SessionManager.java | 8 ++++---- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/gcube/application/framework/core/session/ASLSession.java b/src/main/java/org/gcube/application/framework/core/session/ASLSession.java index 525f591..cd6b25f 100644 --- a/src/main/java/org/gcube/application/framework/core/session/ASLSession.java +++ b/src/main/java/org/gcube/application/framework/core/session/ASLSession.java @@ -211,19 +211,12 @@ public class ASLSession{ public void setScope(String scope) { logger.info("The scope about to set is: " + scope); lastUsedTime = System.currentTimeMillis(); - String test = scope.trim(); - if (test == null) - logger.info("1"); - test = scope.trim().substring(1); - if (test == null) - logger.info("2"); String[] split = scope.trim().substring(1).split("/",2); - // Uncomment this and comment the line bellow for devsec - // String vo = "/" + split[0].toLowerCase(); + //Uncomment this and comment the line bellow for devsec + //String vo = "/" + split[0].toLowerCase(); String vo = "/" + split[0]; if(split.length > 1) vo += "/" + split[1]; - logger.info("*** VRE to be set:" + vo + " ***"); logger.info("GCube scope returns: " + GCUBEScope.getScope(vo)); this.scope = GCUBEScope.getScope(vo); String previousScopeName = scopeName; @@ -237,7 +230,7 @@ public class ASLSession{ initializeAttributes(); // clear the attribute loggedIn = false; - logger.info("Passing the logging because the variable was set"); + logger.debug("Passing the logging because the variable was set"); return; } if ((previousScopeName != null && !previousScopeName.equals(scopeName)) || previousScopeName == null) { @@ -247,14 +240,13 @@ public class ASLSession{ LoginToVreAccessLogEntry loginEntry = new LoginToVreAccessLogEntry(); accessLogger.logEntry(username, scope, loginEntry); } else - logger.info("Passing the logging because the scope was the same"); + logger.debug("Passing the logging because the scope was the same"); initializeAttributes(); } public void logUserLogin(String scope) { - logger.info("LogUserLogin method called"); innerSession.clear(); loggedIn = true; // ACCESS LOGGER diff --git a/src/main/java/org/gcube/application/framework/core/session/Notifier.java b/src/main/java/org/gcube/application/framework/core/session/Notifier.java index b5f5e4f..43f2c0f 100644 --- a/src/main/java/org/gcube/application/framework/core/session/Notifier.java +++ b/src/main/java/org/gcube/application/framework/core/session/Notifier.java @@ -24,7 +24,7 @@ class Notifier { public void notifyAllWaiting() throws InterruptedException { - logger.info("Sending wake up signal to " + sem.getQueueLength() + " receivers..."); + logger.debug("Sending wake up signal to " + sem.getQueueLength() + " receivers..."); sem.release(sem.getQueueLength()); } } diff --git a/src/main/java/org/gcube/application/framework/core/session/SessionManager.java b/src/main/java/org/gcube/application/framework/core/session/SessionManager.java index c40c600..8848c60 100644 --- a/src/main/java/org/gcube/application/framework/core/session/SessionManager.java +++ b/src/main/java/org/gcube/application/framework/core/session/SessionManager.java @@ -40,9 +40,9 @@ public class SessionManager { @Override protected void finalize() throws Throwable { thread.interrupt(); - logger.info(new Date(System.currentTimeMillis()) + " clean thread was interrupted"); + logger.debug(new Date(System.currentTimeMillis()) + " clean thread was interrupted"); thread.join(); - logger.info(new Date(System.currentTimeMillis()) + " clean thread was joint"); + logger.debug(new Date(System.currentTimeMillis()) + " clean thread was joint"); super.finalize(); } @@ -57,7 +57,7 @@ public class SessionManager { Thread.sleep(300000); } catch (InterruptedException e) { logger.error("Exception:", e); - logger.info(new Date(System.currentTimeMillis()) + " clean thread was interrupted (in clean thread)"); + logger.debug(new Date(System.currentTimeMillis()) + " clean thread was interrupted (in clean thread)"); break; } //TODO: cleanup invalid sessions: add locks... @@ -72,7 +72,7 @@ public class SessionManager { } } } - logger.info(new Date(System.currentTimeMillis()) + " clean thread was terminated"); + logger.debug(new Date(System.currentTimeMillis()) + " clean thread was terminated"); } }