From b2c2e2872e7b15ee2b0d4202e57433b227e81641 Mon Sep 17 00:00:00 2001
From: jlew <jlew.blackout@gmail.com>
Date: Sun, 27 Mar 2011 17:07:21 +0000
Subject: Better Error handling

---
diff --git a/FileShare.server/server.py b/FileShare.server/server.py
index 3cff570..1c46d74 100644
--- a/FileShare.server/server.py
+++ b/FileShare.server/server.py
@@ -181,8 +181,8 @@ class MyServer(BaseHTTPServer.BaseHTTPRequestHandler):
                 self.end_headers()
                 self.wfile.write( data )
 
-            except IOError:
-                self.send_error(500,'Server Error')
+            except IOError, err:
+                self.send_error(500,'Server IO Error: %s' % str(err))
                 self.end_headers()
         else:
             self.send_error(404,'File Not Found: %s' % self.path)
@@ -213,8 +213,12 @@ class MyServer(BaseHTTPServer.BaseHTTPRequestHandler):
                         # Begin the response
                         self.send_response(200)
                         self.end_headers()
-                    except:
-                        self.send_error(500,'Server Error or Invalid Request')
+
+                    except IOError, err:
+                        self.send_error(500,'Server IO Error: %s' % str(err))
+
+                    except Exception, err:
+                        self.send_error(500,'Server Error or Invalid Request: %s' % str(err))
                         self.end_headers()
                 return
             else:
--
cgit v0.9.1