From 02304dd35da52b8e7f8f69fc8cdc9cd1e218fe5b Mon Sep 17 00:00:00 2001
From: Graham Hughes <ghughes@meteor.com>
Date: Thu, 11 Jun 2015 23:18:51 -0700
Subject: [PATCH] Change livedata to reflect new, single method name

---
 packages/ddp-client/livedata_connection.js | 9 +++------
 packages/ddp-server/livedata_server.js     | 6 +-----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/packages/ddp-client/livedata_connection.js b/packages/ddp-client/livedata_connection.js
index 9df6a09e2c..86bca75a44 100644
--- a/packages/ddp-client/livedata_connection.js
+++ b/packages/ddp-client/livedata_connection.js
@@ -214,7 +214,7 @@ var Connection = function (url, options) {
     // Any message counts as receiving a pong, as it demonstrates that
     // the server is still alive.
     if (self._heartbeat) {
-      self._heartbeat.pongReceived();
+      self._heartbeat.messageReceived();
     }
 
     if (msg === null || !msg.msg) {
@@ -242,11 +242,8 @@ var Connection = function (url, options) {
         options.onDDPVersionNegotiationFailure(description);
       }
     }
-    else if (msg.msg === 'ping') {
-      if (options.respondToPings)
-        self._send({msg: "pong", id: msg.id});
-      if (self._heartbeat)
-        self._heartbeat.pingReceived();
+    else if (msg.msg === 'ping' && options.respondToPings) {
+      self._send({msg: "pong", id: msg.id});
     }
     else if (msg.msg === 'pong') {
       // noop, as we assume everything's a pong
diff --git a/packages/ddp-server/livedata_server.js b/packages/ddp-server/livedata_server.js
index 31f8fdda66..33ac4d9633 100644
--- a/packages/ddp-server/livedata_server.js
+++ b/packages/ddp-server/livedata_server.js
@@ -508,17 +508,13 @@ _.extend(Session.prototype, {
     // the client is still alive.
     if (self.heartbeat) {
       Fiber(function () {
-        self.heartbeat.pongReceived();
+        self.heartbeat.messageReceived();
       }).run();
     }
 
     if (self.version !== 'pre1' && msg_in.msg === 'ping') {
       if (self._respondToPings)
         self.send({msg: "pong", id: msg_in.id});
-      if (self.heartbeat)
-        Fiber(function () {
-          self.heartbeat.pingReceived();
-        }).run();
       return;
     }
     if (self.version !== 'pre1' && msg_in.msg === 'pong') {