From 4d9d4abbb4398e90b2fb9d9fc6f924ac171bae64 Mon Sep 17 00:00:00 2001
From: Frank Celler <frank@arangodb.com>
Date: Fri, 2 Mar 2012 12:09:24 +0100
Subject: [PATCH] better error handling

---
 V8Client/shell.cpp    | 10 +++++-----
 js/client/client.js   | 20 ++++++++++++++++++++
 js/client/js-client.h | 25 +++++++++++++++++--------
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/V8Client/shell.cpp b/V8Client/shell.cpp
index 619a82c7a1..febdbb14a0 100644
--- a/V8Client/shell.cpp
+++ b/V8Client/shell.cpp
@@ -903,11 +903,15 @@ int main (int argc, char* argv[]) {
       StartupLoader.defineScript("client/client.js", JS_client_client);
     }
     else {
+<<<<<<< HEAD
 <<<<<<< HEAD
       LOGGER_DEBUG << "using JavaScript startup files at '" << StartupPath << "'";
 =======
       LOGGER_INFO << "using JavaScript startup files at '" << StartupPath << "'";
 >>>>>>> JS loader for avocsh
+=======
+      LOGGER_DEBUG << "using JavaScript startup files at '" << StartupPath << "'";
+>>>>>>> better error handling
       StartupLoader.setDirectory(StartupPath);
     }
 
@@ -934,11 +938,7 @@ int main (int argc, char* argv[]) {
     RunShell(context);
 =======
 
-    RunMain(context, argc, argv);
-
-    if (RunShellFlag) {
-      RunShell(context);
-    }
+    RunShell(context);
 
 >>>>>>> JS loader for avocsh
   }
diff --git a/js/client/client.js b/js/client/client.js
index d02e1e90bb..6740eae544 100644
--- a/js/client/client.js
+++ b/js/client/client.js
@@ -926,6 +926,7 @@ AvocadoDatabase.prototype._help = function () {
   print(helpAvocadoDatabase);
 }
 
+<<<<<<< HEAD
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief return a string representation of the database object
 ////////////////////////////////////////////////////////////////////////////////
@@ -1127,3 +1128,22 @@ catch (err) {
 // mode: outline-minor
 // outline-regexp: "^\\(/// @brief\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @}\\)"
 // End:
+=======
+try {
+
+  //
+  // default database
+  // 
+  db = new AvocadoDatabase(avocado);
+
+  //
+  // load collection data
+  // 
+  db._collections();
+
+  help();
+}
+catch (err) {
+  print(COLOR_RED + "connection failure: " + err + COLOR_BLACK);
+}
+>>>>>>> better error handling
diff --git a/js/client/js-client.h b/js/client/js-client.h
index ea8c11ef3a..7e71ee0ee3 100644
--- a/js/client/js-client.h
+++ b/js/client/js-client.h
@@ -1416,17 +1416,26 @@ static string JS_client_client =
   "// End:\n"
 =======
   "\n"
-  "//\n"
-  "// default database\n"
-  "// \n"
-  "db = new AvocadoDatabase(avocado);\n"
+  "try {\n"
   "\n"
-  "//\n"
-  "// load collection data\n"
-  "// \n"
+  "  //\n"
+  "  // default database\n"
+  "  // \n"
+  "  db = new AvocadoDatabase(avocado);\n"
   "\n"
-  "db._collections();\n"
+  "  //\n"
+  "  // load collection data\n"
+  "  // \n"
+  "  db._collections();\n"
   "\n"
+<<<<<<< HEAD
   "help();\n"
 >>>>>>> JS loader for avocsh
+=======
+  "  help();\n"
+  "}\n"
+  "catch (err) {\n"
+  "  print(COLOR_RED + \"connection failure: \" + err + COLOR_BLACK);\n"
+  "}\n"
+>>>>>>> better error handling
 ;