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.2 by ajm, Fri Mar 9 03:30:55 2001 UTC vs.
Revision 1.4 by ajm, Sun Mar 18 00:54:04 2001 UTC

# Line 1 | Line 1
1   //---PACKAGE DECLARATION---
2 < package uk.ac.ukc.iscream.client.monitors;
2 > package uk.org.iscream.client.monitors;
3  
4   //---IMPORTS---
5   import java.util.HashMap;
# Line 7 | Line 7 | import java.util.ArrayList;
7   import java.util.Set;
8   import java.util.Iterator;
9   import java.text.NumberFormat;
10 < import uk.ac.ukc.iscream.client.*;
11 < import uk.ac.ukc.iscream.core.*;
12 < import uk.ac.ukc.iscream.util.*;
13 < import uk.ac.ukc.iscream.componentmanager.*;
10 > import uk.org.iscream.client.*;
11 > import uk.org.iscream.core.*;
12 > import uk.org.iscream.util.*;
13 > import uk.org.iscream.componentmanager.*;
14  
15   /**
16   * This Monitor watches the Disks for all machines
# Line 109 | Line 109 | public class Disk__Monitor extends MonitorSkeleton {
109                              // don't try to continue and process, try next disk
110                              break;
111                          }
112 <            
113 <                        // percentage of memory in use
114 <                        double diskInUse = (1 - (diskAvail / diskTotal)) * 100;
112 >                        
113 >                        boolean useValue = false;
114 >                        try {
115 >                            String option = _cp.getProperty("Host." + source, "Monitor." + _name + ".thresholdMeasure");
116 >                            if (option.equals("VALUE")) {
117 >                                useValue = true;
118 >                            }                            
119 >                        } catch (PropertyNotFoundException e) {
120 >                            // we default to percentage
121 >                        }
122 >                        
123 >                        // this  bit determines if the disk check is a % check
124 >                        // or a kb check
125 >                        double diskInUse;
126 >                        if(useValue) {
127 >                            // kb disk in use
128 >                            diskInUse = diskTotal - diskAvail;
129 >                        } else {
130 >                            // kb disk in use
131 >                            diskInUse = (1 - (diskAvail / diskTotal)) * 100;
132 >                        }
133 >                        
134 >                        
135 >                        
136                          int newThreshold = checkAttributeThreshold(diskInUse, reg);
137              
138                          // format the memoryInUse to a String
# Line 134 | Line 155 | public class Disk__Monitor extends MonitorSkeleton {
155       * Overrides the {@link java.lang.Object#toString() Object.toString()}
156       * method to provide clean logging (every class should have this).
157       *
158 <     * This uses the uk.ac.ukc.iscream.util.NameFormat class
158 >     * This uses the uk.org.iscream.util.NameFormat class
159       * to format the toString()
160       *
161       * @return the name of this class and its CVS revision

Diff Legend

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