From 817402b5208b0dbc92a64ed094a936c56c8c1e49 Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Tue, 5 Aug 2008 08:01:52 +0000
Subject: Added catch of non responding postgresql database.

---
 server/src/server.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'server')

diff --git a/server/src/server.cc b/server/src/server.cc
index 353708f..a419181 100644
--- a/server/src/server.cc
+++ b/server/src/server.cc
@@ -54,7 +54,7 @@ static std::string error_box(std::string message)
   std::string errorbox =
     "  <course name=\"error\">\n"
     "    <macro name=\"error\">\n"
-    "      <window caption=\"ERROR!\" height=\"240\" layout=\"vbox\" name=\"error\" width=\"320\">\n"
+    "      <window caption=\"ERROR!\" height=\"300\" layout=\"vbox\" name=\"error\" width=\"480\">\n"
     "        <textedit name=\"errorlabel\" value=\"" + message + "\"/>\n"
     "        <button action=\"cancel\" caption=\"Luk\" name=\"cancel\"/>\n"
     "      </window>\n"
@@ -204,7 +204,9 @@ static void connection(TCPSocket &socket)
       socket.write(answer);
       i++;
     }
-  } catch(std::exception &e) {
+  } catch( PGSTD::runtime_error &e ) {
+    socket.write(error_box(xml_encode(std::string("PostgreSQL server error:\n") + e.what())));
+  } catch( std::exception &e ) {
     socket.write(error_box(xml_encode(e.what())));
   }
 
-- 
cgit v1.2.3