Merge pull request #372 from parisiale/PCP-344

(PCP-344) Rely on cpp-pcp-client's ttl_expired callback
puppetlabs · Mar 29, 2016 · 841a2c8 · 841a2c8
2 parents 47b5d5e + 8976461
commit 841a2c8
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 15 deletions.
diff --git a/lib/inc/pxp-agent/agent.hpp b/lib/inc/pxp-agent/agent.hpp
@@ -74,10 +74,6 @@ class Agent {
     // will send a PXP non-blocking response containing the action
     // outcome when finished.
     void nonBlockingRequestCallback(const PCPClient::ParsedChunks& parsed_chunks);
-
-    // Callback for PCPClient::Connector handling incoming PCP TTL
-    // Expired messages; it will only log the ID of the expired msg.
-    void ttlExpiredCallback(const PCPClient::ParsedChunks& parsed_chunks);
 };
 
 }  // namespace PXPAgent

diff --git a/lib/src/agent.cc b/lib/src/agent.cc
@@ -41,12 +41,6 @@ void Agent::start() {
             nonBlockingRequestCallback(parsed_chunks);
         });
 
-    connector_ptr_->registerMessageCallback(
-        PCPClient::Protocol::TTLExpiredSchema(),
-        [this](const PCPClient::ParsedChunks& parsed_chunks) {
-            ttlExpiredCallback(parsed_chunks);
-        });
-
     int num_seconds {};
     std::random_device rd {};
     std::default_random_engine engine { rd() };
@@ -99,9 +93,4 @@ void Agent::nonBlockingRequestCallback(const PCPClient::ParsedChunks& parsed_chu
     request_processor_.processRequest(RequestType::NonBlocking, parsed_chunks);
 }
 
-void Agent::ttlExpiredCallback(const PCPClient::ParsedChunks& parsed_chunks) {
-    LOG_WARNING("Received TTL expired message - expired message ID: %1%",
-                parsed_chunks.data.get<std::string>("id"));
-}
-
 }  // namespace PXPAgent