Changeset 9853bc3 in nscp for modules/NRPEClient/NRPEClient.cpp

Timestamp:

11/29/11 14:03:54 (18 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

f33c12f

Parents:

96c1461

Message:

• Fixed some NSCA issues (reading from new conf)
• Fixed some linux build issues (related to refactoring)

File:

• modules/NRPEClient/NRPEClient.cpp (modified) (3 diffs)

modules/NRPEClient/NRPEClient.cpp

@@ -82 +82 @@
       ;
 
-    settings.alias(_T("/targets/default")).add_key_to_settings()
+    settings.alias().add_key_to_settings(_T("targets/default"))
 
       (_T("timeout"), sh::uint_key(&timeout, 30),
@@ -386 +386 @@
 #else
       NSC_LOG_ERROR_STD(_T("SSL not avalible (compiled without USE_SSL)"));
-      return boost::tie(NSCAPI::returnUNKNOWN, _T("SSL support not available (compiled without USE_SSL)"));
+      return boost::make_tuple(NSCAPI::returnUNKNOWN, _T("SSL support not available (compiled without USE_SSL)"));
 #endif
     } else
@@ -392 +392 @@
     return boost::make_tuple(static_cast<int>(packet.getResult()), packet.getPayload());
   } catch (nrpe::nrpe_packet_exception &e) {
-    return boost::tie(NSCAPI::returnUNKNOWN, _T("NRPE Packet errro: ") + e.wwhat());
+    return boost::make_tuple(NSCAPI::returnUNKNOWN, _T("NRPE Packet errro: ") + e.wwhat());
   } catch (std::runtime_error &e) {
     NSC_LOG_ERROR_STD(_T("Socket error: ") + utf8::to_unicode(e.what()));
-    return boost::tie(NSCAPI::returnUNKNOWN, _T("Socket error: ") + utf8::to_unicode(e.what()));
+    return boost::make_tuple(NSCAPI::returnUNKNOWN, _T("Socket error: ") + utf8::to_unicode(e.what()));
   } catch (std::exception &e) {
     NSC_LOG_ERROR_STD(_T("Error: ") + utf8::to_unicode(e.what()));
-    return boost::tie(NSCAPI::returnUNKNOWN, _T("Error: ") + utf8::to_unicode(e.what()));
+    return boost::make_tuple(NSCAPI::returnUNKNOWN, _T("Error: ") + utf8::to_unicode(e.what()));
   } catch (...) {
-    return boost::tie(NSCAPI::returnUNKNOWN, _T("Unknown error -- REPORT THIS!"));
+    return boost::make_tuple(NSCAPI::returnUNKNOWN, _T("Unknown error -- REPORT THIS!"));
   }
 }