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

Comparing projects/cms/source/server/uk/org/iscream/cms/server/filter/TCPReaderInit.java (file contents):
Revision 1.14 by tdb, Thu Feb 1 00:18:42 2001 UTC vs.
Revision 1.18 by tdb, Mon Feb 12 00:35:03 2001 UTC

# Line 43 | Line 43 | class TCPReaderInit extends Thread {
43          _queue = queue;
44          // setup the reader & writer
45          _socketIn = new BufferedReader(new InputStreamReader(_socket.getInputStream()));
46 <        _socketOut = new PrintWriter(_socket.getOutputStream());
46 >        _socketOut = new PrintWriter(_socket.getOutputStream(), true);
47          _logger.write(toString(), Logger.SYSINIT, "created");
48      }
49      
# Line 64 | Line 64 | class TCPReaderInit extends Thread {
64              inBound = _socketIn.readLine();
65              if(!inBound.equals("HEARTBEAT")) {
66                  _socketOut.println("ERROR");
67 –                _socketOut.flush();
67                  throw new IOException("protocol error - expecting:HEARTBEAT got:" + inBound);
68              } else {
69                  _socketOut.println("OK");
71 –                _socketOut.flush();
70              }
71              
72              inBound = _socketIn.readLine();
73              if(!inBound.equals("CONFIG")) {
74                  _socketOut.println("ERROR");
77 –                _socketOut.flush();
75                  throw new IOException("protocol error - expecting:CONFIG got:" + inBound);
76              } else {
77                  _socketOut.println("OK");
81 –                _socketOut.flush();
78              }
79              
80              inBound = _socketIn.readLine();
81              filelist = inBound;
82              _socketOut.println("OK");
87 –            _socketOut.flush();
83              
84              inBound = _socketIn.readLine();
85              lastModified = inBound;
# Line 97 | Line 92 | class TCPReaderInit extends Thread {
92              else {
93                  _socketOut.println("OK");
94              }
100 –            _socketOut.flush();
95              
96              inBound = _socketIn.readLine();
97              if(!inBound.equals("ENDHEARTBEAT")) {
98                  _socketOut.println("ERROR");
105 –                _socketOut.flush();
99                  throw new IOException("protocol error - expecting:ENDHEARTBEAT got:" + inBound);
100              } else {
101                  _socketOut.println("OK");
109 –                _socketOut.flush();
102              }
103  
104 <            String date = new Long(System.currentTimeMillis()).toString();
104 >            String date = new Long(System.currentTimeMillis()/((long) 1000)).toString();
105              String hostname = _socket.getInetAddress().getHostName();
106              String ipadd = _socket.getInetAddress().getHostAddress();
115 –            String xml = "<packet type=\"heartbeat\" machine_name=\""+hostname+"\" date=\""+date+"\" ip=\""+ipadd+"\"></packet>";
107              
108 +            // run the service checks for this host
109 +            _logger.write(toString(), Logger.DEBUG, "Running service checks");
110 +            String checks = PluginServiceCheckManager.getInstance().runServiceChecks(hostname);
111 +            
112 +            // build the heartbeat packet
113 +            String xml = "<packet type=\"heartbeat\" machine_name=\""+hostname+"\" date=\""+date+"\" ip=\""+ipadd+"\">" + checks + "</packet>";
114 +            
115 +            // get it to be sent on
116              _queue.add(xml);
117              
118          } catch (Exception e) {
119              _logger.write(toString(), Logger.ERROR, "ERROR: " + e.getMessage());
120          }
121          
123 –        _socketOut.flush();
122          // Disconnect streams & socket
123          try {
124              _socketIn.close();

Diff Legend

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