diff --git a/server/HttpCmdReceiver.py b/server/HttpCmdReceiver.py index 74dd5bd..509d7ec 100644 --- a/server/HttpCmdReceiver.py +++ b/server/HttpCmdReceiver.py @@ -49,21 +49,16 @@ class HttpCmdHandler(BaseHTTPServer.BaseHTTPRequestHandler): except KeyError, e: raise LocalException('Parameter missing: ' + e.msg) - try: - dynid = subdomain - zone = 'yadynns.net' + dynid = subdomain + zone = 'yadynns.net' - if HttpCmdHandler.entries.has_key(dynid): - raise LocalException("duplicate dynid") - for entry in HttpCmdHandler.entries.values(): - if entry.name == subdomain and entry.zone == zone: - raise LocalException("duplicate full name") - newEntry = Entry.Entry(dynid, sharedSecret, subdomain, zone) - HttpCmdHandler.entries[dynid] = newEntry - - return 'ok' - except LocalException, e: - return 'nok ' + e.msg + if HttpCmdHandler.entries.has_key(dynid): + raise LocalException("duplicate dynid") + for entry in HttpCmdHandler.entries.values(): + if entry.name == subdomain and entry.zone == zone: + raise LocalException("duplicate full name") + newEntry = Entry.Entry(dynid, sharedSecret, subdomain, zone) + HttpCmdHandler.entries[dynid] = newEntry class HttpCmdServer(SocketServer.ThreadingTCPServer):