From: Maxim Mamontov <faust.madf@gmail.com>
Date: Sun, 21 Sep 2014 20:14:24 +0000 (+0300)
Subject: Handle failures in Conn ctor.
X-Git-Tag: 2.409~263
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/1eda2370d8c666d9d61fd8f03fff24e2f444ec87

Handle failures in Conn ctor.
---

diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
index d28ece17..847e1ebc 100644
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
@@ -230,9 +230,16 @@ void CONFIGPROTO::AcceptConnection()
     assert(m_users != NULL);
     assert(m_tariffs != NULL);
 
-    m_conns.push_back(new STG::Conn(*m_settings, *m_admins, *m_users, *m_tariffs, sock, outerAddr));
-
-    printfd(__FILE__, "New connection from %s:%d\n", inet_ntostring(m_conns.back()->IP()).c_str(), m_conns.back()->Port());
+    try
+    {
+        m_conns.push_back(new STG::Conn(*m_settings, *m_admins, *m_users, *m_tariffs, sock, outerAddr));
+        printfd(__FILE__, "New connection from %s:%d\n", inet_ntostring(m_conns.back()->IP()).c_str(), m_conns.back()->Port());
+    }
+    catch (const STG::Conn::Error & error)
+    {
+        // Unlikely.
+        m_logger(std::string("Failed to create new client connection: '") + error.what() + "'.");
+    }
 }
 /*
 void CONFIGPROTO::WriteLogAccessFailed(uint32_t ip)