[Pymoul-svn] SF.net SVN: pymoul: [139] pymoul/trunk

[<ti...@us...>]

Revision: 139
          http://pymoul.svn.sourceforge.net/pymoul/?rev=139&view=rev
Author:   tiran
Date:     2007-02-05 06:03:09 -0800 (Mon, 05 Feb 2007)

Log Message:
-----------
Added make serverlist command
Updated serverlist: removed bogus tests

Modified Paths:
--------------
    pymoul/trunk/Makefile.in
    pymoul/trunk/src/moul/server/ping.py
    pymoul/trunk/src/moul/server/serverlist.py

Modified: pymoul/trunk/Makefile.in
===================================================================
--- pymoul/trunk/Makefile.in	2007-02-05 04:14:41 UTC (rev 138)
+++ pymoul/trunk/Makefile.in	2007-02-05 14:03:09 UTC (rev 139)
@@ -97,3 +97,6 @@
 importchecker:
 	$(PYTHON) utilities/importchecker.py ./src/moul/
 
+serverlist:
+	 PYTHONPATH="src" $(PYTHON) src/moul/server/serverlist.py
+

Modified: pymoul/trunk/src/moul/server/ping.py
===================================================================
--- pymoul/trunk/src/moul/server/ping.py	2007-02-05 04:14:41 UTC (rev 138)
+++ pymoul/trunk/src/moul/server/ping.py	2007-02-05 14:03:09 UTC (rev 139)
@@ -32,7 +32,7 @@
     """A server object
     """
     
-    def __init__(self, name, port, timeout=3.0):
+    def __init__(self, name, port=PORT, timeout=3.0):
         self._name = name
         self._port = int(port)
         self._timeout = float(timeout)

Modified: pymoul/trunk/src/moul/server/serverlist.py
===================================================================
--- pymoul/trunk/src/moul/server/serverlist.py	2007-02-05 04:14:41 UTC (rev 138)
+++ pymoul/trunk/src/moul/server/serverlist.py	2007-02-05 14:03:09 UTC (rev 139)
@@ -43,8 +43,6 @@
     'uruapp-cw15.ibs.aol.com',
     'uruapp-cw16.ibs.aol.com',
     'uruapp-cw17.ibs.aol.com',
-    'bogus.test.example', # no DNS
-    'www.urulive.com',  # no PING
     ## The servers below are available via ICMP ping but have no running game
     ## server (2006-01-17)
     #'uruapp-cw18.ibs.aol.com',
@@ -53,3 +51,24 @@
     #'uruapp-cw21.ibs.aol.com',
     #'uruapp-cw22.ibs.aol.com',
 ]
+
+def _ping():
+    """Search for new servers
+    """
+    from moul.server.ping import Server
+    new = []
+    for i in range(1, 25):
+        name = 'uruapp-cw%02i.ibs.aol.com' % i
+        srv = Server(name)
+        dns = srv.dns()
+        pp = srv.portping()
+        print name, dns, pp
+        if isinstance(dns, float) and isinstance(pp, float) and \
+          name not in SERVER_LIST:
+            new.append(name)
+    print "\nNew servers found:\n"
+    for name in new:
+        print "    '%s'," % name
+
+if __name__ == '__main__':
+    _ping()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.