[Jason-developers] SF.net SVN: jason:[1620] trunk/src/jason

[<jom...@us...>]

Revision: 1620
          http://jason.svn.sourceforge.net/jason/?rev=1620&view=rev
Author:   jomifred
Date:     2010-10-19 10:16:14 +0000 (Tue, 19 Oct 2010)

Log Message:
-----------
fix logging problem: if verbose is not set, leave the current logging conf and do not override with INFO level.

Modified Paths:
--------------
    trunk/src/jason/asSemantics/Agent.java
    trunk/src/jason/asSemantics/TransitionSystem.java
    trunk/src/jason/infra/centralised/CentralisedAgArch.java
    trunk/src/jason/infra/jade/JadeAgArch.java
    trunk/src/jason/infra/saci/SaciAgArch.java
    trunk/src/jason/runtime/Settings.java

Modified: trunk/src/jason/asSemantics/Agent.java
===================================================================
--- trunk/src/jason/asSemantics/Agent.java	2010-10-18 17:34:32 UTC (rev 1619)
+++ trunk/src/jason/asSemantics/Agent.java	2010-10-19 10:16:14 UTC (rev 1620)
@@ -207,7 +207,8 @@
         Agent a = new Agent();
         
         a.setLogger(arch);
-        a.logger.setLevel(this.getTS().getSettings().logLevel());
+        if (this.getTS().getSettings().verbose() >= 0)
+            a.logger.setLevel(this.getTS().getSettings().logLevel());
 
         a.bb = this.bb.clone();
         a.pl = this.pl.clone();
@@ -519,7 +520,8 @@
     public void setTS(TransitionSystem ts) {
         this.ts = ts;
         setLogger(ts.getUserAgArch());
-        logger.setLevel(ts.getSettings().logLevel());        
+        if (ts.getSettings().verbose() >= 0)
+            logger.setLevel(ts.getSettings().logLevel());        
     }
 
     public TransitionSystem getTS() {

Modified: trunk/src/jason/asSemantics/TransitionSystem.java
===================================================================
--- trunk/src/jason/asSemantics/TransitionSystem.java	2010-10-18 17:34:32 UTC (rev 1619)
+++ trunk/src/jason/asSemantics/TransitionSystem.java	2010-10-19 10:16:14 UTC (rev 1620)
@@ -103,7 +103,7 @@
         nrcslbr = setts.nrcbp(); // to do BR to start with
 
         setLogger(agArch);
-        if (setts != null)
+        if (setts != null && setts.verbose() >= 0)
             logger.setLevel(setts.logLevel());
         
         if (a != null)

Modified: trunk/src/jason/infra/centralised/CentralisedAgArch.java
===================================================================
--- trunk/src/jason/infra/centralised/CentralisedAgArch.java	2010-10-18 17:34:32 UTC (rev 1619)
+++ trunk/src/jason/infra/centralised/CentralisedAgArch.java	2010-10-19 10:16:14 UTC (rev 1620)
@@ -118,7 +118,8 @@
     
     public void setLogger() {
         logger = Logger.getLogger(CentralisedAgArch.class.getName() + "." + getAgName());
-        logger.setLevel(userAgArch.getTS().getSettings().logLevel());       
+        if (userAgArch.getTS().getSettings().verbose() >= 0)
+            logger.setLevel(userAgArch.getTS().getSettings().logLevel());       
     }
     
     public Logger getLogger() {

Modified: trunk/src/jason/infra/jade/JadeAgArch.java
===================================================================
--- trunk/src/jason/infra/jade/JadeAgArch.java	2010-10-18 17:34:32 UTC (rev 1619)
+++ trunk/src/jason/infra/jade/JadeAgArch.java	2010-10-19 10:16:14 UTC (rev 1620)
@@ -83,7 +83,8 @@
                 userAgArch = (AgArch) Class.forName(ap.archClass.getClassName()).newInstance();
                 userAgArch.setArchInfraTier(this);
                 userAgArch.initAg(ap.agClass.getClassName(), ap.getBBClass(), ap.asSource.getAbsolutePath(), ap.getAsSetts(false, false));
-                logger.setLevel(userAgArch.getTS().getSettings().logLevel());
+                if (userAgArch.getTS().getSettings().verbose() >= 0)
+                    logger.setLevel(userAgArch.getTS().getSettings().logLevel());
         
                 registerAgInDF();
             

Modified: trunk/src/jason/infra/saci/SaciAgArch.java
===================================================================
--- trunk/src/jason/infra/saci/SaciAgArch.java	2010-10-18 17:34:32 UTC (rev 1619)
+++ trunk/src/jason/infra/saci/SaciAgArch.java	2010-10-19 10:16:14 UTC (rev 1620)
@@ -131,7 +131,8 @@
             userAgArch = (AgArch) Class.forName(archClassName).newInstance();
             userAgArch.setArchInfraTier(this);
             userAgArch.initAg(agClassName, bbPars, asSource, stts);
-            logger.setLevel(userAgArch.getTS().getSettings().logLevel());
+            if (userAgArch.getTS().getSettings().verbose() >= 0)
+                logger.setLevel(userAgArch.getTS().getSettings().logLevel());
         } catch (Exception e) {
             running = false;
             throw new JasonException("as2j: error creating the agent class! - " + e.getMessage());

Modified: trunk/src/jason/runtime/Settings.java
===================================================================
--- trunk/src/jason/runtime/Settings.java	2010-10-18 17:34:32 UTC (rev 1619)
+++ trunk/src/jason/runtime/Settings.java	2010-10-19 10:16:14 UTC (rev 1620)
@@ -40,7 +40,7 @@
     public static final boolean   OSameFocus      = true;
     public static final boolean   ONewFocus       = false;
     public static final int       ODefaultNRC     = 1;
-    public static final int       ODefaultVerbose = 1;
+    public static final int       ODefaultVerbose = -1;
     public static final boolean   ODefaultSync    = false;
     
     private static Logger logger = Logger.getLogger(Settings.class.getName());          


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.