From d86f1bf6f4eac25cf18b566abbcb118e6c0b59d8 Mon Sep 17 00:00:00 2001
From: checktheroads <mtt.lov@gmail.com>
Date: Tue, 14 May 2019 12:03:58 -0700
Subject: [PATCH] fixed error raising issue

---
 hyperglass/configuration/__init__.py |  8 ++++++--
 hyperglass/hyperglass.py             | 10 ++++------
 manage.py                            |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/hyperglass/configuration/__init__.py b/hyperglass/configuration/__init__.py
index 592ebbf..eb802be 100644
--- a/hyperglass/configuration/__init__.py
+++ b/hyperglass/configuration/__init__.py
@@ -2,8 +2,10 @@
 import os
 import math
 import toml
+import hyperglass
 
 dir = os.path.dirname(os.path.abspath(__file__))
+hyperglass_root = os.path.dirname(hyperglass.__file__)
 
 
 def blacklist():
@@ -194,7 +196,8 @@ class gen:
         list = []
         for a in general:
             if len(a["cache_directory"]) == 0:
-                return ".flask_cache"
+                d = ".flask_cache"
+                return os.path.join(hyperglass_root, d)
             else:
                 return a["cache_directory"]
 
@@ -310,7 +313,8 @@ class brand:
         list = []
         for t in branding:
             if len(t["logo_path"]) == 0:
-                return "static/images/hyperglass-dark.png"
+                f = "static/images/hyperglass-dark.png"
+                return os.path.join(hyperglass_root, f)
             else:
                 return t["logo_path"]
 
diff --git a/hyperglass/hyperglass.py b/hyperglass/hyperglass.py
index ce5caf9..00d8a3c 100644
--- a/hyperglass/hyperglass.py
+++ b/hyperglass/hyperglass.py
@@ -160,11 +160,9 @@ def lg():
     else:
         logger.info(f"Cache match for: {cache_key}, returning cached entry...")
         try:
-            return Response(cache.get(cache_key), value_code)
+            return Response(cache.get(cache_key))
         except:
-            id = 4152
-            raise RuntimeError(
-                id + ":\s" + "Unable to return cached output.", 415, *value_params
-            )
+            raise
             # Upon exception, render generic error
-            return Response(errorGeneral(id))
+            log.error(f"Error returning cached entry for: {cache_key}")
+            return Response(errorGeneral(4152))
diff --git a/manage.py b/manage.py
index a332871..0740731 100755
--- a/manage.py
+++ b/manage.py
@@ -25,7 +25,7 @@ def clearcache():
 @main.command()
 def testserver():
     try:
-        render.css.renderTemplate()
+        hyperglass.render.css.renderTemplate()
         hyperglass.app.run(host="0.0.0.0", debug=True, port=5000)
         logger.error("Started test server.")
     except: