ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/client/monitors/Disk__Monitor.java
(Generate patch)

Comparing projects/cms/source/server/uk/org/iscream/cms/server/client/monitors/Disk__Monitor.java (file contents):
Revision 1.12 by tdb, Wed Nov 7 17:55:40 2001 UTC vs.
Revision 1.14 by tdb, Mon Nov 26 11:59:19 2001 UTC

# Line 126 | Line 126 | public class Disk__Monitor extends MonitorSkeleton {
126  
127                      boolean useValue = false;
128                      try {
129 <                        String option = _cp.getProperty("Host." + source, "Monitor." + _name + ".thresholdMeasure");
129 >                        // try looking for a mount-point specific thresholdMeasure first
130 >                        String option = _cp.getProperty("Host." + source, "Monitor." + _name + "." + mount + ".thresholdMeasure");
131                          if (option.equals("VALUE")) {
132                              useValue = true;
133 <                        }                            
133 >                        }
134                      } catch (PropertyNotFoundException e) {
135 <                        // we default to percentage
135 >                        try {
136 >                            // now look for a more general thresholdMeasure
137 >                            String option = _cp.getProperty("Host." + source, "Monitor." + _name + ".thresholdMeasure");
138 >                            if (option.equals("VALUE")) {
139 >                                useValue = true;
140 >                            }
141 >                        } catch (PropertyNotFoundException f) {
142 >                            // we default to percentage in any case
143 >                        }
144                      }
145  
146                      // this  bit determines if the disk check is a % check
# Line 207 | Line 216 | public class Disk__Monitor extends MonitorSkeleton {
216       * @param negateCheck whether to negate the check
217       * @return the threshold level breached, if any
218       */
219 <    private int checkAttributeThreshold(double diskInUse, Register reg, boolean negateCheck) {
219 >    private int checkAttributeThreshold(double value, Register reg, boolean negateCheck) {
220          for(int thresholdLevel = Alert.thresholdLevels.length - 1; thresholdLevel >= 0; thresholdLevel--) {
221              if (reg.getThreshold(thresholdLevel) != -1.0) {
222                  if(!negateCheck) {
223                      // normal check - has the value gone *over* the threshold
224 <                    if(((double) reg.getThreshold(thresholdLevel)) < diskInUse) {
224 >                    if(((double) reg.getThreshold(thresholdLevel)) < value) {
225                          return thresholdLevel;
226                      }
227                  }
228                  else {
229                      // negated check - has the value gone *under* the threshold
230 <                    if(((double) reg.getThreshold(thresholdLevel)) > diskInUse) {
230 >                    if(((double) reg.getThreshold(thresholdLevel)) > value) {
231                          return thresholdLevel;
232                      }
233                  }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines