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.10 by tdb, Wed Nov 7 15:58:43 2001 UTC vs.
Revision 1.13 by tdb, Thu Nov 15 11:47:30 2001 UTC

# Line 55 | Line 55 | public class Disk__Monitor extends MonitorSkeleton {
55          // key prefix
56          String keyPrefix = "packet.disk.p";
57          
58 <        // a tempory holder for all the disk attributes we find
58 >        // a temporary holder for all the disk attributes we find
59          ArrayList disks = new ArrayList();
60  
61          // unfortunatly we need to check the whole packet
# Line 99 | Line 99 | public class Disk__Monitor extends MonitorSkeleton {
99  
100                      // check if we've seen this disk before on a previous run
101                      // if not, we need to create a register for it
102 <                    if(!diskRegisters.containsKey(diskNumber)) {
103 <                        diskRegisters.put(diskNumber, new Register(source, _name, mount));
102 >                    //   nb. use the device as the key as this is unlikely to change,
103 >                    //       unlike diskNumber which could easily change
104 >                    //         (diskNumber is based on the order of df's output!)
105 >                    if(!diskRegisters.containsKey(device)) {
106 >                        diskRegisters.put(device, new Register(source, _name, mount));
107                      }
108  
109                      // get the register for this disk
110 <                    Register reg = (Register) diskRegisters.get(diskNumber);
110 >                    Register reg = (Register) diskRegisters.get(device);
111  
112                      // get the packet data
113                      double diskTotal, diskAvail;
# Line 123 | 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

Diff Legend

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