traipse_dev: orpg/networking/meta_server

annotate orpg/networking/meta_server_lib.py @ 124:8827271fbe1b alpha

Traipse Alpha 'OpenRPG' {091001-01} Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to the code. 'Ornery-Orc's main goal is to offer more advanced features and enhance the productivity of the user. Update Summary (Cleaning up for Beta) Added Bookmarks Fix to Remote Admin Commands Minor fix to text based Server Fix to Pretty Print, from Core Fix to Splitter Nodes not being created Fix to massive amounts of images loading, from Core Added 'boot' command to remote admin Added confirmation window for sent nodes Minor changes to allow for portability to an OpenSUSE linux OS Miniatures Layer pop up box allows users to turn off Mini labels, from FlexiRPG Zoom Mouse plugin added Images added to Plugin UI Switching to Element Tree Map efficiency, from FlexiRPG Added Status Bar to Update Manager default_manifest.xml renamed to default_upmana.xml Cleaner clode for saved repositories New TrueDebug Class in orpg_log (See documentation for usage) Mercurial's hgweb folder is ported to upmana Happy Halloween!

author	sirebral
date	Sun, 01 Nov 2009 11:36:14 -0600
parents	36919b8a3ef9
children	06f10429eedc

rev	line source
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1 #!/usr/bin/python2.1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	2 # Copyright (C) 2000-2001 The OpenRPG Project
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	3 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	4 # openrpg-dev@lists.sourceforge.net
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	5 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	6 # This program is free software; you can redistribute it and/or modify
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	7 # it under the terms of the GNU General Public License as published by
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	8 # the Free Software Foundation; either version 2 of the License, or
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	9 # (at your option) any later version.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	10 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	11 # This program is distributed in the hope that it will be useful,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	12 # but WITHOUT ANY WARRANTY; without even the implied warranty of
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	13 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	14 # GNU General Public License for more details.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	15 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	16 # You should have received a copy of the GNU General Public License
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	17 # along with this program; if not, write to the Free Software
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	18 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	19 # --
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	20 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	21 # File: meta_server_lib.py
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	22 # Author: Chris Davis
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	23 # Maintainer:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	24 # Version:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	25 # $Id: meta_server_lib.py,v 1.40 2007/04/04 01:18:42 digitalxero Exp $
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	26 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	27 # Description: A collection of functions to communicate with the meta server.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	28 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	29
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	30
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	31 #added debug flag for meta messages to cut console server spam --Snowdog
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	32 META_DEBUG = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	33
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	34 __version__ = "$Id: meta_server_lib.py,v 1.40 2007/04/04 01:18:42 digitalxero Exp $"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	35
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	36 from orpg.orpg_version import PROTOCOL_VERSION
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	37 from orpg.orpgCore import component
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	38 from orpg.tools.validate import validate
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	39 from orpg.dirpath import dir_struct
124 8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	40
8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	41 import urllib, time, sys, traceback, re
8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	42 #import orpg.minidom
8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	43
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	44 from threading import *
124 8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	45 from random import uniform
8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	46 from urllib import urlopen, urlencode
8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	47 from orpg.tools.orpg_log import debug
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	48
122 36919b8a3ef9 Traipse Alpha 'OpenRPG' {091031-00} sirebral parents: 119 diff changeset	49 from xml.etree.ElementTree import Element, fromstring
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	50
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	51 metacache_lock = RLock()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	52
124 8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	53 def get_server_dom(data=None,path=None, string=False):
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	54 # post data at server and get the resulting DOM
124 8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	55 #debug()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	56 if path == None:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	57 # get meta server URI
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	58 path = getMetaServerBaseURL()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	59
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	60 # POST the data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	61 if META_DEBUG:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	62 print
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	63 print "Sending the following POST info to Meta at " + path + ":"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	64 print "=========================================="
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	65 print data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	66 print
124 8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	67 file = urlopen(path, data)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	68 data = file.read()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	69 file.close()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	70
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	71 # Remove any leading or trailing data. This can happen on some satellite connections
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	72 p = re.compile('(<servers>.*?</servers>)',re.DOTALL\|re.IGNORECASE)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	73 mo = p.search(data)
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	74 if mo: data = mo.group(0)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	75
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	76 if META_DEBUG:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	77 print
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	78 print "Got this string from the Meta at " + path + ":"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	79 print "==============================================="
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	80 print data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	81 print
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	82 # build dom
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	83 etreeEl = data
124 8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	84 if not string: return fromstring(etreeEl)
8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	85 else: return etreeEl
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	86
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	87 def post_server_data(name, realHostName=None):
124 8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	88 #debug()
8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	89 if realHostName: data = urlencode({"server_data[name]":name,
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	90 "server_data[version]":PROTOCOL_VERSION,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	91 "act":"new",
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	92 "REMOTE_ADDR": realHostName })
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	93 # print "Letting meta server decide the hostname to list..."
124 8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	94 else: data = urlencode({"server_data[name]":name,
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	95 "server_data[version]":PROTOCOL_VERSION,
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	96 "act":"new"})
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	97 path = component.get('settings').get('MetaServerBaseURL') #getMetaServerBaseURL()
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	98 etreeEl = get_server_dom(data, path)
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	99 return int(etreeEl.get('id'))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	100
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	101 def post_failed_connection(id,meta=None,address=None,port=None):
124 8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	102 #debug((meta, address, port))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	103 # For now, turning this off. This needs to be re-vamped for
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	104 # handling multiple Metas.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	105 return 0
124 8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	106 #data = urlencode({"id":id,"act":"failed"});
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	107 #xml_dom = get_server_dom(data)
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	108 #ret_val = int(xml_dom.getAttribute("return"))
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	109 #return ret_val
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	110
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	111 def remove_server(id):
124 8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	112 #debug(id)
8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	113 data = urlencode({"id":id,"act":"del"});
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	114 etreeEl = get_server_dom(data)
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	115 return int(etreeEl.get("return"))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	116
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	117 def byStartAttribute(first, second):
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	118 # This function is used to easily sort a list of nodes by their start time
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	119 # Ensure there is something to sort with for each
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	120
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	121 first_start = int(first.get('start')) or 0
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	122 second_start = int(second.get('start')) or 0
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	123
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	124 # Return the result of the cmp function on the two strings
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	125 return cmp(first_start, second_start)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	126
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	127 def byNameAttribute(first, second):
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	128 # This function is used to easily sort a list of nodes by their name attribute
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	129 # Ensure there is something to sort with for each
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	130
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	131 first_name = first.get('name') or ''
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	132 second_name = second.get('name') or ''
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	133
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	134 # Return the result of the cmp function on the two strings
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	135 return cmp(first_name,second_name)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	136
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	137
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	138 def get_server_list(versions = None, sort_by="start"):
124 8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	139 data = urlencode({"version":PROTOCOL_VERSION,"ports":"%"})
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	140 all_metas = getMetaServers(versions, 1) # get the list of metas
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	141 base_meta = getMetaServerBaseURL()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	142
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	143 #all_metas.reverse() # The last one checked will take precedence, so reverse the order
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	144 # so that the top one on the actual list is checked last
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	145 return_hash = {} # this will end up with an amalgamated list of servers
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	146
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	147 for meta in all_metas: # check all of the metas
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	148 #get the server's xml from the current meta
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	149 bad_meta = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	150 #print "Getting server list from " + meta + "..."
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	151 try: xml_dom = get_server_dom(data=data, path=meta)
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	152 except: bad_meta = 1 #print "Trouble getting servers from " + meta + "..."
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	153 if bad_meta: continue
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	154 if base_meta == meta: updateMetaCache(xml_dom) #print "This is our base meta: " + meta
124 8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	155 node_list = xml_dom.findall('server')
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	156 if len(node_list): # if there are entries in the node list
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	157 # otherwise, just loop to next meta
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	158
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	159 # for each node found, we're going to check the nodes from prior
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	160 # metas in the list. If a match is found, then use the new values.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	161 for n in node_list:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	162 # set them from current node
122 36919b8a3ef9 Traipse Alpha 'OpenRPG' {091031-00} sirebral parents: 119 diff changeset	163 if not n.get('name'): n.set('name','NO_NAME_GIVEN')
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	164 name = n.get('name')
122 36919b8a3ef9 Traipse Alpha 'OpenRPG' {091031-00} sirebral parents: 119 diff changeset	165 if not n.get('num_users'): n.set('num_users','N/A')
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	166 num_users = n.get('num_users')
122 36919b8a3ef9 Traipse Alpha 'OpenRPG' {091031-00} sirebral parents: 119 diff changeset	167 if not n.get('address'): n.set('address','NO_ADDRESS_GIVEN')
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	168 address = n.get('address')
122 36919b8a3ef9 Traipse Alpha 'OpenRPG' {091031-00} sirebral parents: 119 diff changeset	169 if not n.get('port'): n.set('port','6774')
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	170 port = n.get('port')
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	171 n.set('meta',meta)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	172 end_point = str(address) + ":" + str(port)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	173 if return_hash.has_key(end_point):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	174 if META_DEBUG: print "Replacing duplicate server entry at " + end_point
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	175 return_hash[end_point] = n
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	176
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	177 # At this point, we have an amalgamated list of servers
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	178 # Now, we have to construct a new DOM to pass back.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	179
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	180 # Create a servers element
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	181 server_list = Element('servers')
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	182
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	183 # get the nodes stored in return_hash
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	184 sort_list = return_hash.values()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	185
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	186 # sort them by their name attribute. Uses byNameAttribute()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	187 # defined above as a comparison function
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	188 if sort_by == "start": sort_list.sort(byStartAttribute)
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	189 elif sort_by == "name": sort_list.sort(byNameAttribute)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	190
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	191 # Add each node to the DOM
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	192 for n in sort_list: server_list.append(n)
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	193 return server_list
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	194
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	195 ## List Format:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	196 ## <servers>
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	197 ## <server address=? id=? name=? failed_count=? >
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	198 ## </servers>
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	199
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	200 def updateMetaCache(xml_dom):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	201 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	202 if META_DEBUG: print "Updating Meta Server Cache"
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	203 metaservers = xml_dom.findall('metaservers') # pull out the metaservers bit
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	204 if len(metaservers) == 0:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	205 cmetalist = getRawMetaList()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	206 xml_dom = get_server_dom(cmetalist[0])
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	207 metaservers = xml_dom.findall('metaservers')
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	208 authoritative = metaservers[0].get('auth')
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	209 if META_DEBUG: print " Authoritive Meta: "+str(authoritative)
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	210 metas = metaservers[0].findall("meta") # get the list of metas
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	211 if META_DEBUG: print " Meta List ("+str(len(metas))+" servers)"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	212 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	213 metacache_lock.acquire()
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	214 ini = open(dir_struct["user"]+"metaservers.cache","w")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	215 for meta in metas:
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	216 if META_DEBUG: print " Writing: "+str(meta.get('path'))
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	217 ini.write(str(meta.get('path')) + " " + str(meta.get('versions')) + "\n")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	218 ini.close()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	219 finally:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	220 metacache_lock.release()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	221 except Exception, e:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	222 if META_DEBUG: traceback.print_exc()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	223 print "Meta Server Lib: UpdateMetaCache(): " + str(e)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	224
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	225 def getRawMetaList(path=None):
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	226 ### Alpha ###
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	227 """This code will allow for a list of metas to be created. Future developement will more integrate the list of metas"""
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	228 if path != None:
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	229 metas = []
124 8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	230 data = urlencode({"version":PROTOCOL_VERSION,"ports":"%"})
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	231 xml_dom = get_server_dom(data, path)
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	232 node_list = fromstring(xml_dom).findall('meta_server')
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	233 if len(node_list):
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	234 for n in node_list:
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	235 metas.append(n.get('path'))
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	236 return metas
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	237 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	238 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	239 metacache_lock.acquire()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	240 # Read in the metas
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	241 validate.config_file("metaservers.cache","metaservers.cache")
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	242 ini = open(dir_struct["user"]+"metaservers.cache","r")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	243 metas = ini.readlines()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	244 ini.close()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	245 return metas
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	246 finally:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	247 metacache_lock.release()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	248 except Exception, e:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	249 if META_DEBUG: traceback.print_exc()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	250 print "Meta Server Lib: getRawMetaList(): " + str(e)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	251 return []
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	252
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	253 def getMetaServers(versions = None, pick_random=0):
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	254 """
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	255 get meta server URLs as a list
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	256 versions is a list of acceptable version numbers.
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	257 A False truth value will use getMetaServerBaseURL()
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	258 set a default if we have weird reading problems
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	259 default_url = "http://www.openrpg.com/openrpg_servers.php"
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	260 """
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	261
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	262 ### Pre Alpha Design ###
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	263 """ Here is how to handle Multiple Meta servers, and probably the best way to do it. Create an XML file that contains nodes with the various servers. Users will grab that meta data and have the option to connect to multiple meta servers which will allow them to find all the rooms. A check box should be used so if one server faile the users can continue without much lag. When creating a server hosts will need to select a meta to go too. This should be in the final of Ornery Orc."""
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	264 meta_names = []
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	265 if(versions): # If versions are supplied, then look in metaservers.conf
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	266 try:
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	267 """
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	268 read in the metas from file
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	269 format of file is one meta entry per line
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	270 each entry will be the meta url, followed by one or more version numbers that it
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	271 handle. Generally, this will be either a 1 for the original Meta format, or
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	272 2 for the new one.
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	273 """
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	274 # Read in the metas
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	275 #Adding a path object will attempt to look for a meta_network.
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	276 metas = getRawMetaList()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	277
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	278 # go through each one to check if it should be returned, based on the
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	279 # version numbers allowed.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	280 for meta in metas:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	281 # split the line on whitespace
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	282 # obviously, your meta servers urls shouldn't contain whitespace. duh.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	283 words = meta.split()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	284 success = 0 # init success flag for version check
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	285 for version in versions: # run through each allowed version from caller
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	286 if version in words[1:]: # if the allowed version token was found
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	287 success += 1 # then increment the success indicator
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	288 if success: # if the meta entry is acceptable to the caller
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	289 meta_names.append(words[0]) # add the entry
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	290 if META_DEBUG: print "adding metaserver " + meta
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	291
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	292 # at this point, we should have at least one name from the cache. If not ...
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	293 if not meta_names:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	294 default_meta = getMetaServerBaseURL() # grab the meta from ini.xml
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	295 meta_names.append(default_meta) # add it to the return list
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	296 # print "Warning!!\nNo valid metaservers cached."
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	297 # print "Using meta from MetaServerBaseURL: " + default_meta + "\n"
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	298 # if we have more than one and want a random one
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	299 elif pick_random:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	300 if META_DEBUG: print "choosing random meta from: " + str(meta_names)
124 8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	301 i = int(uniform(0,len(meta_names)))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	302 #meta = meta_names[i]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	303 meta_names = [meta_names[i]]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	304 if META_DEBUG: print "using: " + str(meta_names)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	305 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	306 if META_DEBUG: print "using all metas: " + str(meta_names)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	307 return meta_names
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	308 except Exception,e:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	309 print e
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	310 #print "using default meta server URI: " + default_url
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	311 metas = []
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	312 #metas.append(default_url)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	313 return metas # return an empty list
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	314 else: # otherwise, use MetaServerBaseURL()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	315 url = getMetaServerBaseURL()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	316 meta_names.append(url)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	317 return meta_names
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	318
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	319 def getMetaServerBaseURL():
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	320 # get meta server URL
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	321 url = "http://www.openrpg.com/openrpg_servers.php"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	322 try:
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	323 component.get('validate').config_file("settings.xml","default_settings.xml")
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	324 ini = open(dir_struct["user"]+"settings.xml","r")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	325 txt = ini.read()
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	326 xml = component.get('xml')
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 0 diff changeset	327 tree = xml.parseXml(txt)._get_documentElement()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	328 ini.close()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	329 node_list = tree.getElementsByTagName("MetaServerBaseURL")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	330 if node_list:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	331 url = node_list[0].getAttribute("value")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	332 # allow tree to be collected
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	333 try: tree.unlink()
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	334 except: pass
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	335
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	336 except Exception,e:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	337 print e
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	338 #print "using meta server URI: " + url
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	339 return url
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	340
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	341 """
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	342 Beginning of Class registerThread
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	343
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	344 A Class to Manage Registration with the Meta2
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	345 Create an instance and call it's start() method
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	346 if you want to be (and stay) registered. This class
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	347 will take care of registering and re-registering as
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	348 often as necessary to stay in the Meta list.
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	349
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	350 You may call register() yourself if you wish to change your
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	351 server's name. It will immediately update the Meta. There
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	352 is no need to unregister first.
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	353
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	354 Call unregister() when you no longer want to be registered.
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	355 This will result in the registerThread dying after
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	356 attempting to immediately remove itself from the Meta.
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	357
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	358 If you need to become registered again after that, you
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	359 must create a new instance of class registerThread. Don't
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	360 just try to call register() on the old, dead thread class.
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	361 """
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	362
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	363 class registerThread(Thread):
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	364 """
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	365 Originally, I wrote this as a sub-class of wxThread, but
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	366 A) I couldn't get it to import right
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	367 B) I realized that I want this to be used in a server,
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	368 which I don't want needing wxWindows to run!
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	369
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	370 Because of this fact, there are some methods from wxThread
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	371 that I implemented to minimize changes to the code I had
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	372 just written, i.e. TestDeleteStatus() and Delete()
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	373 """
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	374
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	375 def __init__(self, name=None, realHostName=None, num_users="0",
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	376 MetaPath=None, port=6774, register_callback=None):
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	377 Thread.__init__(self, name="registerThread")
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	378 self.rlock = RLock() # Re-entrant lock used to make this class thread safe
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	379 self.die_event = Event() # The main loop in run() will wait with timeout on this
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	380 self.name = name or 'Unnamed Server' # Name that the server want's displayed on the Meta
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	381 # But use Unnamed Server if for some crazy reason
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	382 # no name is passed to the constructor
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	383 self.num_users = num_users # the number of users currently on this server
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	384 self.realHostName = realHostName # Name to advertise for connection
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	385 self.id = "0" # id returned from Meta. Defaults to "0", which
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	386 # indicates a new registration.
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	387 self.cookie = "0" # cookie returned from Meta. Defaults to "0", which
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	388 # indicates a new registration.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	389 self.interval = 0 # interval returned from Meta. Is how often to
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	390 # re-register, in minutes.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	391 self.destroy = 0 # Used to flag that this thread should die
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	392 self.port = str(port)
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	393 self.register_callback = register_callback # set a method to call to report result of register
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	394 """
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	395 This thread will communicate with one and only one
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	396 Meta. If the Meta in ini.xml is changed after
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	397 instantiation, then this instance must be
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	398 unregistered and a new instance instantiated.
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	399
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	400 Also, if MetaPath is specified, then use that. Makes
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	401 it easier to have multiple registerThreads going to keep the server registered
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	402 on multiple (compatible) Metas.
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	403 """
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	404 if MetaPath == None: self.path = getMetaServerBaseURL() # Do this if no Meta specified
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	405 else: self.path = MetaPath
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	406
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	407 def getIdAndCookie(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	408 return self.id, self.cookie
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	409
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	410 def TestDeleteStatus(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	411 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	412 self.rlock.acquire()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	413 return self.die_event.isSet()
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	414 finally: self.rlock.release()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	415
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	416 def Delete(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	417 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	418 self.rlock.acquire()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	419 self.die_event.set()
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	420 finally: self.rlock.release()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	421
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	422 def run(self):
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	423 """
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	424 This method gets called by Thread implementation
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	425 when self.start() is called to begin the thread's
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	426 execution
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	427
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	428 We will basically enter a loop that continually
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	429 re-registers this server and sleeps Interval
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	430 minutes until the thread is ordered to die in place
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	431 """
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	432 while(not self.TestDeleteStatus()): # Loop while until told to die
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	433 # Otherwise, call thread safe register().
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	434 self.register(self.name, self.realHostName, self.num_users)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	435 if META_DEBUG: print "Sent Registration Data"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	436 # register() will end up setting the state variables
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	437 # for us, including self.interval.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	438 try:
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	439 self.rlock.acquire() # Serialize access to this state information
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	440
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	441 if self.interval >= 3: # If the number of minutes is one or greater
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	442 self.interval -= 1 # wake up with 30 seconds left to re-register
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	443 else:
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	444 self.interval = .5 # Otherwise, we probably experienced some kind
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	445 # of error from the Meta in register(). Sleep
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	446 # for 6 seconds and start from scratch.
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	447
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	448 finally: self.rlock.release() # no matter what, release the lock
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	449 # Wait interval minutes for a command to die
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	450 die_signal = self.die_event.wait(self.interval*60)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	451
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	452 # If we get past the while loop, it's because we've been asked to die,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	453 # so just let run() end. Once this occurs, the thread is dead and
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	454 # calls to Thread.isAlive() return False.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	455
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	456 def unregister(self):
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	457 """
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	458 This method can (I hope) be called from both within the thread
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	459 and from other threads. It will attempt to unregister this
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	460 server from the Meta database
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	461 When this is either accomplished or has been tried hard enough
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	462 (after which it just makes sense to let the Meta remove the
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	463 entry itself when we don't re-register using this id),
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	464 this method will either cause the thread to immediately die
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	465 (if called from this thread's context) or set the Destroy flag
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	466 (if called from the main thread), a positive test for which will cause
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	467 the code in Entry() to exit() when the thread wakes up and
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	468 checks TestDeleteStatus().
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	469 lock the critical section. The unlock will
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	470 automatically occur at the end of the function in the finally clause
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	471 """
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	472 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	473 self.rlock.acquire()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	474 if not self.isAlive(): # check to see if this thread is dead
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	475 return 1 # If so, return an error result
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	476 # Do the actual unregistering here
124 8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	477 data = urlencode( {"server_data[id]":self.id,
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	478 "server_data[cookie]":self.cookie,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	479 "server_data[version]":PROTOCOL_VERSION,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	480 "act":"unregister"} )
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	481 try: # this POSTS the request and returns the result
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	482 xml_dom = get_server_dom(data=data, path=self.path)
122 36919b8a3ef9 Traipse Alpha 'OpenRPG' {091031-00} sirebral parents: 119 diff changeset	483 if xml_dom.get("errmsg"):
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	484 print "Error durring unregistration: " + xml_dom.get("errmsg")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	485 except:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	486 if META_DEBUG: print "Problem talking to Meta. Will go ahead and die, letting Meta remove us."
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	487 # If there's an error, echo it to the console
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	488
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	489 # No special handling is required. If the de-registration worked we're done. If
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	490 # not, then it's because we've already been removed or have a bad cookie. Either
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	491 # way, we can't do anything else, so die.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	492 self.Delete() # This will cause the registerThread to die in register()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	493 # prep xml_dom for garbage collection
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	494 try: xml_dom.unlink()
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	495 except: pass
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	496 return 0
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	497 finally: self.rlock.release()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	498
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	499 def register(self, name=None, realHostName=None, num_users=None):
124 8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	500 #debug((name, realHostName, num_users))
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	501 """
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	502 Designed to handle the registration, both new and
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	503 repeated.
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	504
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	505 It is intended to be called once every interval
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	506 (or interval - delta) minutes.
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	507
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	508 lock the critical section. The unlock will
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	509 automatically occur at the end of the function in the finally clause
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	510 """
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	511 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	512 self.rlock.acquire()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	513 if not self.isAlive(): # check to see if this thread is dead
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	514 return 1 # If so, return an error result
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	515
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	516 # Set the server's attibutes, if specified.
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	517 if name: self.name = name
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	518 if num_users != None: self.num_users = num_users
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	519 if realHostName: self.realHostName = realHostName
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	520 # build POST data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	521 if self.realHostName:
124 8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	522 data = urlencode( {"server_data[id]":self.id,
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	523 "server_data[cookie]":self.cookie,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	524 "server_data[name]":self.name,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	525 "server_data[port]":self.port,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	526 "server_data[version]":PROTOCOL_VERSION,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	527 "server_data[num_users]":self.num_users,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	528 "act":"register",
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	529 "server_data[address]": self.realHostName } )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	530 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	531 if META_DEBUG: print "Letting meta server decide the hostname to list..."
124 8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	532 data = urlencode( {"server_data[id]":self.id,
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	533 "server_data[cookie]":self.cookie,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	534 "server_data[name]":self.name,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	535 "server_data[port]":self.port,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	536 "server_data[version]":PROTOCOL_VERSION,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	537 "server_data[num_users]":self.num_users,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	538 "act":"register"} )
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	539 try: # this POSTS the request and returns the result
124 8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	540 etreeEl = get_server_dom(data=data, path=self.path)
8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	541 #debug(etreeEl)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	542 except:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	543 if META_DEBUG: print "Problem talking to server. Setting interval for retry ..."
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	544 if META_DEBUG: print data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	545 if META_DEBUG: print
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	546 self.interval = 0
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	547 """
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	548 If we are in the registerThread thread, then setting interval to 0
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	549 will end up causing a retry in about 6 seconds (see self.run())
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	550 If we are in the main thread, then setting interval to 0 will do one
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	551 of two things:
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	552 1) Do the same as if we were in the registerThread
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	553 2) Cause the next, normally scheduled register() call to use the values
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	554 provided in this call.
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	555
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	556 Which case occurs depends on where the registerThread thread is when
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	557 the main thread calls register().
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	558 """
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	559 return 0 # indicates that it was okay to call, not that no errors occurred
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	560
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	561 # If there is a DOM returned ....
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	562 if etreeEl:
124 8827271fbe1b Traipse Alpha 'OpenRPG' {091001-01} sirebral parents: 122 diff changeset	563 #debug(etreeEl)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	564 # If there's an error, echo it to the console
122 36919b8a3ef9 Traipse Alpha 'OpenRPG' {091031-00} sirebral parents: 119 diff changeset	565 if etreeEl.get("errmsg"):
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	566 print "Error durring registration: " + etreeEl.get("errmsg")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	567 if META_DEBUG: print data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	568 if META_DEBUG: print
96 65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	569 """
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	570 No special handling is required. If the registration worked, id, cookie, and interval
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	571 can be stored and used for the next time.
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	572 If an error occurred, then the Meta will delete us and we need to re-register as
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	573 a new server. The way to indicate this is with a "0" id and "0" cookie sent to
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	574 the server during the next registration. Since that's what the server returns to
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	575 us on an error anyway, we just store them and the next registration will
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	576 automatically be set up as a new one.
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	577
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	578 Unless the server calls register() itself in the meantime. Of course, that's okay
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	579 too, because a success on THAT register() call will set up the next one to use
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	580 the issued id and cookie.
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	581
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	582 The interval is stored unconditionally for similar reasons. If there's an error,
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	583 the interval will be less than 1, and the main thread's while loop will reset it
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	584 to 6 seconds for the next retry.
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	585 Is it wrong to have a method where there's more comments than code? :)
65c1604e7949 Traipse Alpha 'OpenRPG' {090924-00} sirebral parents: 90 diff changeset	586 """
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	587 try:
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	588 self.interval = int(etreeEl.get("interval"))
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	589 self.id = etreeEl.get("id")
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	590 self.cookie = etreeEl.get("cookie")
122 36919b8a3ef9 Traipse Alpha 'OpenRPG' {091031-00} sirebral parents: 119 diff changeset	591 if not etreeEl.get("errmsg"): updateMetaCache(xml_dom)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	592 except:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	593 if META_DEBUG: print
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	594 if META_DEBUG: print "OOPS! Is the Meta okay? It should be returning an id, cookie, and interval."
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	595 if META_DEBUG: print "Check to see what it really returned.\n"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	596 # Let xml_dom get garbage collected
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	597 try: xml_dom.unlink()
9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	598 except: pass
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	599 else: # else if no DOM is returned from get_server_dom()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	600 print "Error - no DOM constructed from Meta message!"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	601 return 0 # Let caller know it was okay to call us
119 9314d63c0941 Traipse Alpha 'OpenRPG' {091029-00} sirebral parents: 96 diff changeset	602 finally: self.rlock.release()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	603 # End of class registerThread
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	604 ################################################################################

Mercurial > traipse_dev

annotate orpg/networking/meta_server_lib.py @ 124:8827271fbe1b alpha