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/Heartbeat__Monitor.java
(Generate patch)

Comparing projects/cms/source/server/uk/org/iscream/cms/server/client/monitors/Heartbeat__Monitor.java (file contents):
Revision 1.9 by tdb, Wed Mar 7 17:18:48 2001 UTC vs.
Revision 1.11 by tdb, Wed Mar 7 21:38:14 2001 UTC

# Line 72 | Line 72 | public class Heartbeat__Monitor extends MonitorSkeleto
72          }
73      }
74      
75 <    public synchronized void analysePacket(XMLPacket packet) {
75 >    public void analysePacket(XMLPacket packet) {
76          if (packet.getParam("packet.attributes.type").equals("heartbeat")) {
77              String source = packet.getParam("packet.attributes.machine_name");
78              if (!_hosts.containsKey(source)) {
79 <                HashMap registerHash = new HashMap();
80 <                registerHash.put(source, new Register(source, _name, 1));
81 <                _hosts.put(source, new HeartbeatHolder(registerHash));
79 >                synchronized(this) {
80 >                    HashMap registerHash = new HashMap();
81 >                    registerHash.put(source, new Register(source, _name, 1));
82 >                    _hosts.put(source, new HeartbeatHolder(registerHash));
83 >                }
84              }
85              HeartbeatHolder lastHeartbeat = (HeartbeatHolder) _hosts.get(source);
86              lastHeartbeat.setLastHeartbeat(System.currentTimeMillis()/1000);
# Line 133 | Line 135 | public class Heartbeat__Monitor extends MonitorSkeleto
135          // time since last heartbeat (seconds)
136          long timeSinceLastHB = (System.currentTimeMillis()/1000) - lastHeartbeat;
137          // time since (or until if negative) the expected heartbeat
138 <        long timeSinceExpectedHB = timeSinceLastHB + (long) hostHBinterval;
138 >        long timeSinceExpectedHB = timeSinceLastHB - (long) hostHBinterval;
139          
140          // best do a check in case the expected heartbeat is in the future
141          if(timeSinceExpectedHB < 0) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines