From d7498f1c8a039ac18ee92d2b9f2de3b1379b08b8 Mon Sep 17 00:00:00 2001
From: Felix Krause <contact@flyx.org>
Date: Sun, 24 Jan 2016 21:43:33 +0100
Subject: [PATCH] Fixed error reporting in server

---
 server/server.nim | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/server/server.nim b/server/server.nim
index 037ed4d..4824bdb 100644
--- a/server/server.nim
+++ b/server/server.nim
@@ -31,15 +31,14 @@ routes:
             resultNode["code"] = %0
             resultNode["output"] = %output.data
             resp resultNode.pretty, "application/json"
-        except YamlPresenterStreamError:
-            let e = (ref YamlParserError)(getCurrentException().parent)
+        except YamlParserError:
+            let e = (ref YamlParserError)(getCurrentException())
             resultNode["code"] = %1
             resultNode["line"] = %e.line
             resultNode["column"] = %e.column
             resultNode["message"] = %e.msg
             resultNode["detail"] = %e.lineContent
             resp resultNode.pretty, "application/json"
-        
         except YamlPresenterJsonError:
             let e = getCurrentException()
             resultNode["code"] = %2
@@ -48,8 +47,8 @@ routes:
             resp resultNode.pretty, "application/json"
         except:
             let e = getCurrentException()
-            let msg = "Name: " & $e.name & "\nMessage: " & e.msg & "\nTrace:\n" & 
-                      e.getStackTrace
+            let msg = "Name: " & $e.name & "\nMessage: " & e.msg &
+                      "\nTrace:\n" & e.getStackTrace
             resp Http500, msg, "text/plain;charset=utf-8"
 
 runForever()