ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/host/java/SystemMonitor.java
(Generate patch)

Comparing projects/cms/source/host/java/SystemMonitor.java (file contents):
Revision 1.2 by ab11, Mon Nov 27 20:36:30 2000 UTC vs.
Revision 1.7 by ab11, Fri Dec 8 15:45:28 2000 UTC

# Line 2 | Line 2
2  
3   //---IMPORTS---
4  
5 + import java.io.*;
6 + import java.net.*;
7 + import java.util.*;
8 +
9   /**
10   * Gathers system information then outputs it as XML
11   * Collects data based on properties gained from the configurator
# Line 29 | Line 33 | class SystemMonitor {
33          // like things to monitor
34          
35          lastCheck = System.currentTimeMillis();
36 <        sequence = 0;
36 >        sequence = 1;
37  
38  
39          // why oh why wont ultra edit let me put Long in the next line? oh its trying to
40          // correct keywords =|
41 <        checkInterval = Long.parseLong(config.getProperty("UDPINTEVAL"));
41 >        /*
42          
43 +        try {
44 +                udpcheckInterval = Long.parseLong(config.getProperty("UDPUpdateTime")) * 1000;
45 +        }
46 +        catch ( NumberFormatException e ){
47 +                System.out.println("The value for UDPUpdateTime is invalid, using a default");
48 +                // 5 mins
49 +                udpcheckInterval = 5000 * 60;
50 +        }
51 +        */
52 +        
53 +        // make the check interval into seconds
54 +        
55      }
56  
57   //---PUBLIC METHODS---
# Line 47 | Line 63 | class SystemMonitor {
63      */
64      public String getInfo(){
65          // called to retrieve the stored averages and output them as a XML string
66 <        XMLFormatter xml = new XMLFormatter("packet");
66 >        String host = new String();
67 >        String ip = new String();
68 >        try {
69 >            host = InetAddress.getLocalHost().getHostName();
70 >                    ip = InetAddress.getLocalHost().getHostAddress();
71 >        } catch(UnknownHostException e) {
72 >            System.out.println(e);
73 >        }
74 >                String date = Long.toString(System.currentTimeMillis());
75 >        XMLFormatter xml = new XMLFormatter("packet", "machine_name=\""+host+"\" ip=\""+ip+"\" date=\""+date+"\" seq_no=\""+sequence+"\"");
76 >
77 >            // get and decode the data
78 >            DecodeCPU_TXT details = new DecodeCPU_TXT();
79 >
80 >        // add the decoded info
81 >        xml.addString(details.getItems());
82          
52        // just send some dummy info for now.
53        xml.addNest("packet_info");
54            String currentTime = Long.toString(System.currentTimeMillis());
55            xml.addElement("date_time", currentTime );
56            xml.addElement("sequence", Integer.toString(sequence));
57        xml.closeNest();
58        xml.addNest("core");
59            xml.addElement("cpu","100");
60            xml.addElement("memory","200");
61        xml.closeNest();
62        xml.addNest("additional");
63            xml.addElement("users","20");
64        xml.closeNest();
83          
84 +        /*
85          // MUST FIX THIS..!!!!
86 <        while ( System.currentTimeMillis() < ( lastCheck + checkInterval ) ){
87 <          // errm do nothing.. block or something.      
86 >        try {
87 >                long updateIn = ( lastCheck + udpcheckInterval )-System.currentTimeMillis();
88 >                if ( updateIn > 0 ){
89 >                        Thread.sleep(updateIn);
90 >                }
91 >                else
92 >                {
93 >                        Thread.sleep(defaultUpdateTime);
94 >                }
95          }
96 +        catch( InterruptedException e ){
97 +                System.out.println("Sleep interrupted");
98 +        }
99 +        */
100          
101          // increment sequence.
102          sequence++;
103 +        // lastCheck = System.currentTimeMillis();
104                  
105          // finally return a string
106          return xml.returnXML();
# Line 83 | Line 114 | class SystemMonitor {
114  
115      private long lastCheck;
116      private int sequence;
86    private long checkInterval;
117  
118   //---STATIC ATTRIBUTES---
119  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines