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.5 by ab11, Thu Dec 7 18:25:37 2000 UTC vs.
Revision 1.10 by tdb, Sat May 18 18:15:57 2002 UTC

# Line 1 | Line 1
1 + /*
2 + * i-scream central monitoring system
3 + * Copyright (C) 2000-2002 i-scream
4 + *
5 + * This program is free software; you can redistribute it and/or
6 + * modify it under the terms of the GNU General Public License
7 + * as published by the Free Software Foundation; either version 2
8 + * of the License, or (at your option) any later version.
9 + *
10 + * This program is distributed in the hope that it will be useful,
11 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13 + * GNU General Public License for more details.
14 + *
15 + * You should have received a copy of the GNU General Public License
16 + * along with this program; if not, write to the Free Software
17 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
18 + */
19 +
20   //---PACKAGE DECLARATION---
21  
22   //---IMPORTS---
23  
5 import java.util.Random;
24   import java.io.*;
25 + import java.net.*;
26 + import java.util.*;
27  
28   /**
29   * Gathers system information then outputs it as XML
30 < * Collects data based on properties gained from the configurator
31 < * then packages these up using XMLFormatter and outputs them if
32 < * the timeout has passed.
30 > * Collects data based on properties gained from the
31 > * configurator then packages these up using XMLFormatter
32 > * and outputs them if the timeout has passed.
33   *
34   * @author  $Author$
35   * @version $Id$
# Line 23 | Line 43 | class SystemMonitor {
43   //---CONSTRUCTORS---
44  
45   /**
46 < * Public constructor for the class. Takes in a Config object to gain its
47 < * properties from.
46 > * Public constructor for the class. Takes in a Config
47 > * object to gain its properties from.
48   *
49   */  
50   public SystemMonitor( Config config ){
# Line 32 | Line 52 | class SystemMonitor {
52          // like things to monitor
53          
54          lastCheck = System.currentTimeMillis();
55 <        sequence = 0;
36 <
37 <
38 <        // why oh why wont ultra edit let me put Long in the next line? oh its trying to
39 <        // correct keywords =|
40 <        try {
41 <                udpcheckInterval = Long.parseLong(config.getProperty("UDPUpdateTime")) * 1000;
42 <        }
43 <        catch ( NumberFormatException e ){
44 <                System.out.println("The value for UDPUpdateTime is invalid, using a default");
45 <                // 5 mins
46 <                udpcheckInterval = 5000 * 60;
47 <        }
48 <        // make the check interval into seconds
55 >        sequence = 1;
56          
57      }
58  
# Line 58 | Line 65 | class SystemMonitor {
65      */
66      public String getInfo(){
67          // called to retrieve the stored averages and output them as a XML string
68 <        XMLFormatter xml = new XMLFormatter("packet");
69 <        
63 <        // the process to run
68 >        String host = new String();
69 >        String ip = new String();
70          try {
71 <                Process proc = Runtime.getRuntime().exec("/usr/local/sbin/top -s1 -d2 0 > top.txt");
72 <                // this process will take atleast 2 seconds to complete
73 <                try {
74 <                        proc.waitFor();
69 <                }
70 <                catch ( InterruptedException e ){
71 <                        
72 <                }
73 <                        
71 >            host = InetAddress.getLocalHost().getHostName();
72 >            ip = InetAddress.getLocalHost().getHostAddress();
73 >        } catch(UnknownHostException e) {
74 >            System.out.println(e);
75          }
76 <        catch ( IOException e ){
77 <                
78 <        }
79 <        
80 <        
81 <        
82 <        // now do some text processing.
82 <        DecodeCPU_TXT details = new DecodeCPU_TXT("top.txt");
83 <        
84 <        
85 <        Random rand = new Random();
86 <        
87 <        // just send some dummy info for now.
88 <        xml.addNest("packet_info");
89 <            String currentTime = Long.toString(System.currentTimeMillis());
90 <            xml.addElement("date_time", currentTime );
91 <            xml.addElement("sequence", Integer.toString(sequence));
92 <        xml.closeNest();
76 >        String date = Long.toString(System.currentTimeMillis());
77 >        XMLFormatter xml = new XMLFormatter("packet", "machine_name=\""+host+"\" ip=\""+ip+"\" date=\""+date+"\" seq_no=\""+sequence+"\" type=\"data\"");
78 >
79 >        // get and decode the data
80 >        DecodeCPU_TXT details = new DecodeCPU_TXT();
81 >
82 >        // add the decoded info
83          xml.addString(details.getItems());
84          
95        
96        // MUST FIX THIS..!!!!
97        try {
98                long updateIn = ( lastCheck + udpcheckInterval )-System.currentTimeMillis();
99                if ( updateIn > 0 ){
100                        Thread.sleep(updateIn);
101                }
102                else
103                {
104                        Thread.sleep(defaultUpdateTime);
105                }
106        }
107        catch( InterruptedException e ){
108                System.out.println("Sleep interrupted");
109        }
110        
85          // increment sequence.
86          sequence++;
87 <        lastCheck = System.currentTimeMillis();
87 >        // lastCheck = System.currentTimeMillis();
88                  
89          // finally return a string
90          return xml.returnXML();
# Line 124 | Line 98 | class SystemMonitor {
98  
99      private long lastCheck;
100      private int sequence;
127    private long udpcheckInterval;
128    private final long defaultUpdateTime = 60000;
101  
102   //---STATIC ATTRIBUTES---
103  
104 < } // class
104 > } // class

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines