Changeset 4632ff7 in nscp for modules/NSCPClient/NSCPClient.cpp

Timestamp:

08/22/11 21:43:56 (22 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

0b8df3e

Parents:

bd18eb2

Message:

• Fixed so it works on linux (fixed issues with timeout)

File:

• modules/NSCPClient/NSCPClient.cpp (modified) (1 diff)

modules/NSCPClient/NSCPClient.cpp

@@ -250 +250 @@
       return nscp_result_data(NSCAPI::returnUNKNOWN, _T("SSL support not available (compiled without USE_SSL)!"));
 #endif
-    } else
+    } else {
       chunks = send_nossl(con.host, con.port, con.timeout, chunks);
+    }
     BOOST_FOREACH(nscp::packet::nscp_chunk &chunk, chunks) {
-      std::cout << "Found chunk: " << strEx::format_buffer(chunk.payload.c_str(), chunk.payload.size()) << std::endl;
-
+      NSC_DEBUG_MSG_STD(_T("Found chunk: ") + utf8::cvt<std::wstring>(strEx::format_buffer(chunk.payload.c_str(), chunk.payload.size())));
     }
     return nscp_result_data(NSCAPI::returnUNKNOWN, _T("Hello"));
   } catch (nscp::nscp_exception &e) {
+    NSC_LOG_ERROR_STD(_T("Socket error: ") + e.getMessage());
     return nscp_result_data(NSCAPI::returnUNKNOWN, _T("NSCP Packet error: ") + e.getMessage());
   } catch (std::runtime_error &e) {
     NSC_LOG_ERROR_STD(_T("Socket error: ") + utf8::cvt<std::wstring>(e.what()));
     return nscp_result_data(NSCAPI::returnUNKNOWN, _T("Socket error: ") + utf8::cvt<std::wstring>(e.what()));
-  } catch (...) {
+  } catch (std::exception &e) {
+    NSC_LOG_ERROR_STD(_T("Exception: ") + utf8::cvt<std::wstring>(e.what()));
+    return nscp_result_data(NSCAPI::returnUNKNOWN, _T("Socket error: ") + utf8::cvt<std::wstring>(e.what()));
+  } catch (...) {
+    NSC_LOG_ERROR_STD(_T("Unknown exception..."));
     return nscp_result_data(NSCAPI::returnUNKNOWN, _T("Unknown error -- REPORT THIS!"));
   }