Fail silently if email in web-server config is missing and add verbos…

…ity to email
sandialabs · Oct 22, 2015 · 3004fab · 3004fab
1 parent f14e92e
commit 3004fab
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 52 deletions.
diff --git a/packages/slycat/email.py b/packages/slycat/email.py
@@ -3,8 +3,9 @@
 def send_error(subject, body):
   import slycat.web.server
 
-  echo = subprocess.Popen(["echo", "\"%s\"" % body], stdout=subprocess.PIPE)
-  mail = subprocess.Popen(["mail", "-s", "\"%s %s\"" % (slycat.web.server.config["slycat-web-server"]["error-email"]["subject"], subject), slycat.web.server.config["slycat-web-server"]["error-email"]["address"]], stdin=echo.stdout, stdout=subprocess.PIPE)
+  if "error-email" in slycat.web.server.config["slycat-web-server"]:
+    echo = subprocess.Popen(["echo", "\"%s\"" % body], stdout=subprocess.PIPE)
+    mail = subprocess.Popen(["mail", "-s", "\"%s %s\"" % (slycat.web.server.config["slycat-web-server"]["error-email"]["subject"], subject), slycat.web.server.config["slycat-web-server"]["error-email"]["address"]], stdin=echo.stdout, stdout=subprocess.PIPE)
 
-  echo.stdout.close()
-  mail.communicate()
+    echo.stdout.close()
+    mail.communicate()
diff --git a/packages/slycat/web/server/__init__.py b/packages/slycat/web/server/__init__.py
@@ -312,7 +312,7 @@ def put_model_file(database, model, aid, value, content_type, input=False):
 def get_model_file(database, model, aid):
   artifact = model.get("artifact:%s" % aid, None)
   if artifact is None:
-    slycat.email.send_error("slycat.web.server.__init__.py get_model_file", "cherrypy.HTTPError 404")
+    slycat.email.send_error("slycat.web.server.__init__.py get_model_file", "cherrypy.HTTPError 404 artifact is None for aid: %s" % aid)
     raise cherrypy.HTTPError(404)
   artifact_type = model["artifact-types"][aid]
   if artifact_type != "file":

diff --git a/packages/slycat/web/server/database/couchdb.py b/packages/slycat/web/server/database/couchdb.py
@@ -56,10 +56,10 @@ def get(self, type, id):
     try:
       document = self[id]
     except couchdb.client.http.ResourceNotFound:
-      slycat.email.send_error("slycat.web.server.database.couchdb.py get", "cherrypy.HTTPError 404")
+      slycat.email.send_error("slycat.web.server.database.couchdb.py get", "cherrypy.HTTPError 404 couchdb.client.http.ResourceNotFound")
       raise cherrypy.HTTPError(404)
     if document["type"] != type:
-      slycat.email.send_error("slycat.web.server.database.couchdb.py get", "cherrypy.HTTPError 404")
+      slycat.email.send_error("slycat.web.server.database.couchdb.py get", "cherrypy.HTTPError 404 document type %s is different than input type: %s" % (document["type"], type))
       raise cherrypy.HTTPError(404)
     return document