diff options
| -rw-r--r-- | FileShare.activity/FileShareActivity.py | 2 | ||||
| -rw-r--r-- | FileShare.server/server.py | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/FileShare.activity/FileShareActivity.py b/FileShare.activity/FileShareActivity.py index 551c92b..dd4b244 100644 --- a/FileShare.activity/FileShareActivity.py +++ b/FileShare.activity/FileShareActivity.py @@ -461,7 +461,7 @@ class FileShareActivity(Activity): self._new_tube_cb(*tube_info) def _list_tubes_error_cb(self, e): - _loggerg.error('ListTubes() failed: %s', e) + _logger.error('ListTubes() failed: %s', e) def _new_tube_cb(self, id, initiator, type, service, params, state): _logger.debug('New tube: ID=%d initator=%d type=%d service=%s ' 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: |