[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework LoggingManager.java, 1.6, 1.7

[Suresh <sur...@us...>]

Update of /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13959

Modified Files:
	LoggingManager.java 
Log Message:
no message

Index: LoggingManager.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/LoggingManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LoggingManager.java	28 Mar 2006 04:45:35 -0000	1.6
--- LoggingManager.java	6 Sep 2006 22:08:23 -0000	1.7
***************
*** 45,48 ****
--- 45,52 ----
       */
      public static final String DEFAULT_MESSAGE_PATTERN = "%5p [%d{ISO8601}] [%t - %C] %m%n";
+     /**
+      *  Tells whether framework logging has been intialized or not.
+      */
+     private static boolean isFrameworkLoggingInitialized=false;
      
      /**
***************
*** 128,157 ****
       *  @throws ConfigurationException  If logging directory cannot be created.
       */
!     public static void initializeFrameworkLogging(FrameworkConfig.FrameworkLoggingConfig frameworkLoggingConfig)
      {
!         File loggingDirecotry=new File(frameworkLoggingConfig.getJobLoggingDirecotry());
!         LoggingManager.createDirectory(loggingDirecotry);
!         String completeFileName=loggingDirecotry.getAbsolutePath()+File.separator+LoggingManager.FRAMEWORK_LOGGING_FILE;
!         
!         PatternLayout layout=new PatternLayout(LoggingManager.DEFAULT_MESSAGE_PATTERN);
!         RollingFileAppender fileAppender=null;
!         try
!         {
!             fileAppender=new RollingFileAppender(layout,completeFileName,true);
!         }
!         catch(IOException exception)
          {
!             exception.printStackTrace();
!             throw new ConfigurationException(ConfigurationException.LOGGING_CONFIG, exception.getMessage());
          }
!         fileAppender.setMaxFileSize("10MB");
!         fileAppender.activateOptions();
!         Logger rootLogger=LogManager.getRootLogger();
!         rootLogger.removeAllAppenders();
!         
!         Logger frameworkLogger=Logger.getLogger("org.jmonks.batchserver.framework");
!         frameworkLogger.addAppender(fileAppender);
!         frameworkLogger.setAdditivity(true);
!         frameworkLogger.setLevel(Level.toLevel(frameworkLoggingConfig.getFrameworkLoggingLevel()));
      }
          
--- 132,168 ----
       *  @throws ConfigurationException  If logging directory cannot be created.
       */
!     public static synchronized void initializeFrameworkLogging(FrameworkConfig.FrameworkLoggingConfig frameworkLoggingConfig)
      {
!         if(!isFrameworkLoggingInitialized)
          {
!             File loggingDirecotry=new File(frameworkLoggingConfig.getJobLoggingDirecotry());
!             LoggingManager.createDirectory(loggingDirecotry);
!             String completeFileName=loggingDirecotry.getAbsolutePath()+File.separator+LoggingManager.FRAMEWORK_LOGGING_FILE;
! 
!             PatternLayout layout=new PatternLayout(LoggingManager.DEFAULT_MESSAGE_PATTERN);
!             RollingFileAppender fileAppender=null;
!             try
!             {
!                 fileAppender=new RollingFileAppender(layout,completeFileName,true);
!             }
!             catch(IOException exception)
!             {
!                 exception.printStackTrace();
!                 throw new ConfigurationException(ConfigurationException.LOGGING_CONFIG, exception.getMessage());
!             }
!             fileAppender.setMaxFileSize("10MB");
!             fileAppender.activateOptions();
!             Logger rootLogger=LogManager.getRootLogger();
!             rootLogger.removeAllAppenders();
! 
!             Logger frameworkLogger=Logger.getLogger("org.jmonks.batchserver.framework");
!             frameworkLogger.addAppender(fileAppender);
!             frameworkLogger.setAdditivity(true);
!             frameworkLogger.setLevel(Level.toLevel(frameworkLoggingConfig.getFrameworkLoggingLevel()));
!             
!             isFrameworkLoggingInitialized=true;
          }
!         else
!             System.out.println("Framework logging has been already initialized.");
      }