Changeset 912

Timestamp:

06/03/11 16:19:42 (2 years ago)

Author:

philsmart

Message:

 

Location:

raptor-mua/trunk/src/main

Files:

• conf-default/logging.xml (modified) (1 diff)
• config/logging.xml (modified) (2 diffs)
• java/uk/ac/cardiff/raptormua/engine/statistics/Statistic.java (modified) (2 diffs)
• java/uk/ac/cardiff/raptormua/engine/statistics/StatisticsHandler.java (modified) (2 diffs)
• java/uk/ac/cardiff/raptormua/engine/statistics/processor/CutRowsPostProcessor.java (modified) (3 diffs)

raptor-mua/trunk/src/main/conf-default/logging.xml

@@ -23 +23 @@
 
 
-  <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+  <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <file>${LOG_HOME}/raptor-mua-process.log</file>
+     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <!-- daily rollover -->
+      <fileNamePattern>${LOG_HOME}/raptor-mua-process.%d{yyyy-MM-dd}.log</fileNamePattern>
+      <!-- keep 30 days' worth of history -->
+      <maxHistory>30</maxHistory>
+    </rollingPolicy>
     <encoder>
       <pattern>%5p %d \(%C{3}:%L\) ---&gt; %m%n</pattern>
     </encoder>
   </appender>
+
 
   <logger name="org.springframework" level="ERROR">

raptor-mua/trunk/src/main/config/logging.xml

@@ -28 +28 @@
   </appender>
 
-  <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+  <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <file>${LOG_HOME}/raptor-mua-process.log</file>
+     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <!-- daily rollover -->
+      <fileNamePattern>${LOG_HOME}/raptor-mua-process.%d{yyyy-MM-dd}.log</fileNamePattern>
+      <!-- keep 30 days' worth of history -->
+      <maxHistory>30</maxHistory>
+    </rollingPolicy>
     <encoder>
       <pattern>%5p %d \(%C{3}:%L\) ---&gt; %m%n</pattern>
@@ -38 +44 @@
     <appender-ref ref="stdout"/>
   </logger>
-  <logger name="uk.ac.cardiff" level="DEBUG">
+  <logger name="uk.ac.cardiff" level="debug">
     <appender-ref ref="stdout"/>
     <appender-ref ref="FILE"/>

raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/engine/statistics/Statistic.java

@@ -141 +141 @@
                         Observation[] observations = getObservationWithMostGroups(observationSeries);
                         Group[] groups = (Group[]) observations;
+                        log.trace("Has {} groups",groups.length);
                         for (Group group : groups) {
-                                log.trace("Group {}",group.getGroupName());
-                                gmodel.addGroupLabel(group.getGroupName());
-                        }
-                        
+                                log.trace("Group {}",group.getGroupName());                             
+                                gmodel.addGroupLabel(group.getGroupName());                             
+                        }
                         
                         //now add each series and their values
@@ -151 +151 @@
                                 groups = (Group[]) observationSeries.get(i).getObservations();
                                 gmodel.getSeriesLabels().add(statisticParameters.getSeries().get(i).getSeriesLabel());
-
                                 List<Double> values = new ArrayList<Double>();
                                 for (String label : gmodel.getGroupLabels()){

raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/engine/statistics/StatisticsHandler.java

@@ -91 +91 @@
                             //must catch this error here, so we can clear the observations that the statistic has generated
                             statistic.reset();
-                            log.error("Problem constructing graph model for statistic {}",statistic.getStatisticParameters().getUnitName(),e);
-                            e.printStackTrace();
+                            log.error("Problem constructing graph model for statistic {}, {}",statistic.getStatisticParameters().getUnitName(),e.getMessage());
                             return null;
                         }
@@ -121 +120 @@
                         boolean success = true;
                         for (Series series : listOfSeries){
-                                String whereClause=series.computeComparisonAsSQL();                             
+                                String whereClause=series.computeComparisonAsSQL();     
+                                if (whereClause==null)
+                                    whereClause ="";
                                 log.debug("statistical to invoke {}",statistic);
                                 success = statistic.performStatistic(params, whereClause);

raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/engine/statistics/processor/CutRowsPostProcessor.java

@@ -41 +41 @@
 
     /** class logger */
-    static Logger log = LoggerFactory.getLogger(CutRowsPostProcessor.class);
+    private final Logger log = LoggerFactory.getLogger(CutRowsPostProcessor.class);
 
     private int numberOfRowsToKeep;
 
     /**
-     * <p> performs all actions directly ('live') on the input object,and passes that back as a reference to conform with the
+     * <p> performs all actions directly (inplace or 'live') on the input object,and passes that back as a reference to conform with the
      * <code>StatisticsPostProcessor</code> interface </p>
      *
@@ -57 +57 @@
         log.debug("Entries into postprocessor: " + observations.length);
         log.info("Post Processor " + this.getClass());
-        log.debug("Keeping {} rows", numberOfRowsToKeep);
-        if (numberOfRowsToKeep > 0) {
+        int rowsToKeep = (observations.length < numberOfRowsToKeep) ? observations.length : numberOfRowsToKeep;
+        log.debug("Keeping {} rows", rowsToKeep);
+        if (rowsToKeep > 0) {
             if (observations instanceof Group[]) {
-                Group[] cut = new Group[numberOfRowsToKeep];
-                for (int i = 0; (i < observations.length) && (i < numberOfRowsToKeep); i++) {
+                Group[] cut = new Group[rowsToKeep];
+                for (int i = 0; (i < observations.length) && (i < rowsToKeep); i++) {
                     cut[i] = (Group) observations[i];
                 }
@@ -68 +69 @@
             }
             if (observations instanceof Bucket[]) {
-                Bucket[] cut = new Bucket[numberOfRowsToKeep];
-                for (int i = 0; (i < observations.length) && (i < numberOfRowsToKeep); i++) {
+                Bucket[] cut = new Bucket[rowsToKeep];
+                for (int i = 0; (i < observations.length) && (i < rowsToKeep); i++) {
                     cut[i] = (Bucket) observations[i];
                 }