add mongos cmd line support for startup

Author: Kristina Chodorow

handlers.py

@@ -27,6 +27,17 @@ class MongoHandler:
 
     _cursor_id = 0
 
+    def __init__(self, mongos):
+        for host in mongos:
+            args = MongoFakeFieldStorage({"server" : host})
+
+            out = MongoFakeStream()
+
+            name = host.replace(".", "") 
+            name = name.replace(":", "")
+
+            self._connect(args, out.ostream, name = name)
+        
     def _get_connection(self, name = None, host = None, port = None):
         if name == None:
             name = "default"
@@ -108,7 +119,7 @@ def _cmd(self, args, out, name = None, db = None, collection = None):
             out('{"ok" : 0, "errmsg" : "wasn\'t connected to the db and '+
                 'couldn\'t reconnect", "name" : "%s"}' % name)
             return
-        except OperationFailure, error:
+        except (OperationFailure, error):
             out('{"ok" : 0, "errmsg" : "%s"}' % error)
             return
 
@@ -262,6 +273,12 @@ def __output_results(self, cursor, out, batch_size=15):
         try:
             while len(batch) < batch_size:
                 batch.append(cursor.next())
+        except AutoReconnect:
+            out(json.dumps({"ok" : 0, "errmsg" : "auto reconnecting, please try again"}))
+            return
+        except OperationFailure as of:
+            out(json.dumps({"ok" : 0, "errmsg" : "%s" % of}))
+            return
         except StopIteration:
             # this is so stupid, there's no has_next?
             pass

httpd.py

@@ -64,6 +64,7 @@ class MongoHTTPRequest(BaseHTTPRequestHandler):
                   "ico" : "image/vnd.microsoft.icon" }
 
     docroot = "."
+    mongos = None
 
     def _parse_call(self, uri):
         """ 
@@ -207,7 +208,7 @@ def serve_forever(port):
             print "--------Secure Connection--------\n"
             server = MongoServer(('', port), MongoHTTPSRequest)
 
-        MongoHandler.mh = MongoHandler()
+        MongoHandler.mh = MongoHandler(MongoHTTPRequest.mongos)
 
         print "listening for connections on http://localhost:27080\n"
         try:
@@ -234,7 +235,7 @@ def usage():
 if __name__ == "__main__":
 
     try:
-        opts, args = getopt.getopt(sys.argv[1:], "d:s:", ["docroot=", "secure="])
+        opts, args = getopt.getopt(sys.argv[1:], "d:s:m:", ["docroot=", "secure=", "mongos="])
 
         for o, a in opts:
             if o == "-d" or o == "--docroot":
@@ -244,11 +245,12 @@ def usage():
             if o == "-s" or o == "--secure":
                 MongoServer.pem = a
             if o == "-m" or o == "--mongos":
-                MongoServer.mongo = a.split(',')
+                MongoHTTPRequest.mongos = a.split(',')
 
     except getopt.GetoptError:
         print "error parsing cmd line args."
         usage()
         sys.exit(2)
 
     MongoHTTPRequest.serve_forever(27080)
+