From 270db0682083eab3b0b2e3b6bdce65046b6544cc Mon Sep 17 00:00:00 2001
From: Greg Taylor <snagglepants@gmail.com>
Date: Wed, 6 Jun 2007 12:37:34 +0000
Subject: [PATCH] Making get_configvalue a bit more informative if a config
 value can't be found. Also actually populating the webcontext's game_name via
 get_configvalue.

---
 apps/website/webcontext.py |  3 ++-
 gameconf.py                | 10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/apps/website/webcontext.py b/apps/website/webcontext.py
index 297a364602..0fc53093fc 100644
--- a/apps/website/webcontext.py
+++ b/apps/website/webcontext.py
@@ -1,10 +1,11 @@
 from django.conf import settings
+import gameconf
 
 def general_context(request):
    """
    Returns common Evennia-related context stuff.
    """
    return {
-      'game_name': "Test Game",
+      'game_name': gameconf.get_configvalue('site_name'),
       'media_url': settings.MEDIA_URL,
    }
diff --git a/gameconf.py b/gameconf.py
index 04ac2fa165..b4b50afdcf 100644
--- a/gameconf.py
+++ b/gameconf.py
@@ -1,5 +1,8 @@
-from apps.config.models import ConfigValue
 import os
+from traceback import format_exc
+
+from apps.config.models import ConfigValue
+import functions_general
 """
 Handle the setting/retrieving of server config directives.
 """
@@ -16,7 +19,10 @@ def get_configvalue(configname):
    """
    Retrieve a configuration value.
    """
-   return ConfigValue.objects.get(conf_key=configname).conf_value
+   try:
+      return ConfigValue.objects.get(conf_key=configname).conf_value
+   except:
+      functions_genera.log_errmsg("Unable to get config value for %s:\n%s" % (configname, (format_exc())))
 
 def set_configvalue(configname, newvalue):
    """