traipse_dev: orpg/networking/meta_server

annotate orpg/networking/meta_server_lib.py @ 226:b29454610f36 beta

Traipse Beta 'OpenRPG' {100503-00} 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 (Patch-2) Moved to Stable! New Features: New Namespace method with two new syntaxes New Namespace Internal is context sensitive, always! New Namespace External is 'as narrow as you make it' New Namespace FutureCheck helps ensure you don't receive an incorrect node New Namespace 2.0 documentation in the User Manual New Namespace plugin, Allows Traipse users to use the Standard syntax !@ :: @! New Mini Library with minis from Devin Knight New PluginDB access for URL2Link plugin New to Forms, they now show their content in Design Mode New to Update Manager, checks Repo for updates on software start New to Mini Lib node, change title in design mode New to Game Tree, never lose a node, appends a number to the end of corrupted trees New to Server GUI, Traipse Suite's Debug Console New Warhammer PC Sheet Updates: Update to White Board layer, uses a pencil image for color button Update to Grid Layer, uses a grid image for color button Update to Chat Window, size of drop down menus Update to default lobby message Update to template Text node Update to 4e PC Sheet node Update to how display names are acquired Update to Server, added some 'Pious' technology Update to features node Fixes: Fix to Server GUI startup errors Fix to Server GUI Rooms tab updating Fix to Chat and Settings if non existant die roller is picked Fix to Dieroller and .open() used with .vs(). Successes are correctly calculated Fix to Alias Lib's Export to Tree, Open, Save features Fix to alias node, now works properly Fix to Splitter node, minor GUI cleanup Fix to Backgrounds not loading through remote loader Fix to Node name errors Fix to rolling dice in chat Whispers Fix to Splitters Sizing issues Fix to URL2Link plugin, modified regex compilation should remove memory leak Fix to mapy.py, a roll back due to zoomed grid issues Fix to whiteboard_handler, Circles work by you clicking the center of the circle Fix to Servers parse_incoming_dom which was outdated and did not respect XML Fix to a broken link in the server welcome message Fix to InterParse and logger requiring traceback Fix to Update Manager Status Bar Fix to failed image and erroneous pop up Fix to Mini Lib node that was preventing use Fix to plugins that parce dice but did not call InterParse Fix to nodes for name changing by double click Fix to Game Tree, node ordering on drag and drop corrected Fix to Game Tree, corrupted error message was not showing Fix to Update Manager, checks for internet connection Fix to Update Manager, Auto Update corrections Fix to Server GUI's broadcast, room, player messaging

author	sirebral
date	Mon, 03 May 2010 03:29:14 -0500
parents	13054be69834
children	9230a33defd9

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:
184 dcae32e219f1 Traipse Beta 'OpenRPG' {100117-00} sirebral parents: 152 diff changeset	25 # $Id: meta_server_lib.py,v Traipse 'Ornery-Orc' prof.ebral Exp $
0 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
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	37 from orpg.orpgCore import component
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	38 from orpg.tools.validate import validate
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	39 from orpg.dirpath import dir_struct
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	40
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	41 import urllib, time, sys, traceback, re
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	42
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	43 from threading import *
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	44 from random import uniform
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	45 from urllib import urlopen, urlencode
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	46 from orpg.tools.orpg_log import debug
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	47
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	48 from xml.etree.ElementTree import Element, fromstring
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	49 metacache_lock = RLock()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	50
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	51 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	52 # post data at server and get the resulting DOM
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	53 if path == None:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	54 # get meta server URI
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	55 path = getMetaServerBaseURL()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	56
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	57 # POST the data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	58 if META_DEBUG:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	59 print
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	60 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	61 print "=========================================="
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	62 print data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	63 print
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	64 file = urlopen(path, data)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	65 data = file.read()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	66 file.close()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	67
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	68 # 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	69 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	70 mo = p.search(data)
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	71 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	72
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	73 if META_DEBUG:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	74 print
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	75 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	76 print "==============================================="
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	77 print data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	78 print
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	79 # build dom
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	80 etreeEl = data
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	81 if not string: return fromstring(etreeEl)
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	82 else: return etreeEl
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	83
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	84 def post_server_data(name, realHostName=None):
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	85 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	86 "server_data[version]":PROTOCOL_VERSION,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	87 "act":"new",
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	88 "REMOTE_ADDR": realHostName })
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	89 # print "Letting meta server decide the hostname to list..."
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	90 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	91 "server_data[version]":PROTOCOL_VERSION,
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	92 "act":"new"})
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	93 path = component.get('settings').get('MetaServerBaseURL') #getMetaServerBaseURL()
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	94 etreeEl = get_server_dom(data, path)
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	95 return int(etreeEl.get('id'))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	96
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	97 def post_failed_connection(id,meta=None,address=None,port=None):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	98 # 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	99 # handling multiple Metas.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	100 return 0
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	101 #data = urlencode({"id":id,"act":"failed"});
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	102 #xml_dom = get_server_dom(data)
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	103 #ret_val = int(xml_dom.getAttribute("return"))
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	104 #return ret_val
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	105
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	106 def remove_server(id):
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	107 data = urlencode({"id":id,"act":"del"});
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	108 etreeEl = get_server_dom(data)
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	109 return int(etreeEl.get("return"))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	110
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	111 def byStartAttribute(first, second):
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	112 # This function is used to easily sort a list of nodes by their start time
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	113 # 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	114
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	115 first_start = int(first.get('start')) or 0
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	116 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	117
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	118 # Return the result of the cmp function on the two strings
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	119 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	120
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	121 def byNameAttribute(first, second):
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	122 # 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	123 # 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	124
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	125 first_name = first.get('name') or ''
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	126 second_name = second.get('name') or ''
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	127
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	128 # 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	129 return cmp(first_name,second_name)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	130
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	131
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	132 def get_server_list(versions = None, sort_by="start"):
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	133 data = urlencode({"version":PROTOCOL_VERSION,"ports":"%"})
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	134 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	135 base_meta = getMetaServerBaseURL()
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 #all_metas.reverse() # The last one checked will take precedence, so reverse the order
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	138 # so that the top one on the actual list is checked last
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	139 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	140
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	141 for meta in all_metas: # check all of the metas
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	142 #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	143 bad_meta = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	144 #print "Getting server list from " + meta + "..."
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	145 try: xml_dom = get_server_dom(data=data, path=meta)
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	146 except: bad_meta = 1 #print "Trouble getting servers from " + meta + "..."
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	147 if bad_meta: continue
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	148 if base_meta == meta: updateMetaCache(xml_dom) #print "This is our base meta: " + meta
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	149 node_list = xml_dom.findall('server')
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	150 if len(node_list): # if there are entries in the node list
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	151 # 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	152
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	153 # 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	154 # 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	155 for n in node_list:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	156 # set them from current node
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	157 if not n.get('name'): n.set('name','NO_NAME_GIVEN')
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	158 name = n.get('name')
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	159 if not n.get('num_users'): n.set('num_users','N/A')
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	160 num_users = n.get('num_users')
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	161 if not n.get('address'): n.set('address','NO_ADDRESS_GIVEN')
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	162 address = n.get('address')
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	163 if not n.get('port'): n.set('port','6774')
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	164 port = n.get('port')
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	165 n.set('meta',meta)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	166 end_point = str(address) + ":" + str(port)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	167 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	168 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	169 return_hash[end_point] = n
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	170
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	171 # 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	172 # 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	173
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	174 # Create a servers element
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	175 server_list = Element('servers')
0 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 # get the nodes stored in return_hash
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	178 sort_list = return_hash.values()
0 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 # 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	181 # defined above as a comparison function
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	182 if sort_by == "start": sort_list.sort(byStartAttribute)
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	183 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	184
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	185 # Add each node to the DOM
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	186 for n in sort_list: server_list.append(n)
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	187 return server_list
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	188
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	189 ## List Format:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	190 ## <servers>
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	191 ## <server address=? id=? name=? failed_count=? >
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	192 ## </servers>
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	193
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	194 def updateMetaCache(xml_dom):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	195 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	196 if META_DEBUG: print "Updating Meta Server Cache"
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	197 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	198 if len(metaservers) == 0:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	199 cmetalist = getRawMetaList()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	200 xml_dom = get_server_dom(cmetalist[0])
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	201 metaservers = xml_dom.findall('metaservers')
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	202 authoritative = metaservers[0].get('auth')
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	203 if META_DEBUG: print " Authoritive Meta: "+str(authoritative)
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	204 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	205 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	206 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	207 metacache_lock.acquire()
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	208 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	209 for meta in metas:
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	210 if META_DEBUG: print " Writing: "+str(meta.get('path'))
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	211 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	212 ini.close()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	213 finally:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	214 metacache_lock.release()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	215 except Exception, e:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	216 if META_DEBUG: traceback.print_exc()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	217 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	218
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	219 def getRawMetaList(path=None):
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	220 ### Alpha ###
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	221 """This code will allow for a list of metas to be created. Future developement will more integrate the list of metas"""
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	222 if path != None:
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	223 metas = []
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	224 data = urlencode({"version":PROTOCOL_VERSION,"ports":"%"})
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	225 xml_dom = get_server_dom(data, path)
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	226 node_list = fromstring(xml_dom).findall('meta_server')
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	227 if len(node_list):
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	228 for n in node_list:
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	229 metas.append(n.get('path'))
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	230 return metas
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	231 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	232 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	233 metacache_lock.acquire()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	234 # Read in the metas
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	235 validate.config_file("metaservers.cache","metaservers.cache")
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	236 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	237 metas = ini.readlines()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	238 ini.close()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	239 return metas
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	240 finally:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	241 metacache_lock.release()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	242 except Exception, e:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	243 if META_DEBUG: traceback.print_exc()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	244 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	245 return []
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	246
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	247 def getMetaServers(versions = None, pick_random=0):
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	248 """
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	249 get meta server URLs as a list
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	250 versions is a list of acceptable version numbers.
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	251 A False truth value will use getMetaServerBaseURL()
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	252 set a default if we have weird reading problems
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	253 default_url = "http://www.openrpg.com/openrpg_servers.php"
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	254 """
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	255
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	256 ### Pre Alpha Design ###
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	257 """ 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	258 meta_names = []
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	259 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	260 try:
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	261 """
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	262 read in the metas from file
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	263 format of file is one meta entry per line
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	264 each entry will be the meta url, followed by one or more version numbers that it
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	265 handle. Generally, this will be either a 1 for the original Meta format, or
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	266 2 for the new one.
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	267 """
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	268 # Read in the metas
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	269 #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	270 metas = getRawMetaList()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	271
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	272 # 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	273 # version numbers allowed.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	274 for meta in metas:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	275 # split the line on whitespace
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	276 # 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	277 words = meta.split()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	278 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	279 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	280 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	281 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	282 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	283 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	284 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	285
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	286 # 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	287 if not meta_names:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	288 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	289 meta_names.append(default_meta) # add it to the return list
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	290 # print "Warning!!\nNo valid metaservers cached."
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	291 # 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	292 # 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	293 elif pick_random:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	294 if META_DEBUG: print "choosing random meta from: " + str(meta_names)
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	295 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	296 #meta = meta_names[i]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	297 meta_names = [meta_names[i]]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	298 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	299 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	300 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	301 return meta_names
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	302 except Exception,e:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	303 print e
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	304 #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	305 metas = []
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	306 #metas.append(default_url)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	307 return metas # return an empty list
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	308 else: # otherwise, use MetaServerBaseURL()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	309 url = getMetaServerBaseURL()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	310 meta_names.append(url)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	311 return meta_names
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	312
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	313 def getMetaServerBaseURL():
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	314 # get meta server URL
212 13054be69834 Traipse Beta 'OpenRPG' {100428-00} sirebral parents: 184 diff changeset	315 url = "http://orpgmeta.appspot.com/"
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	316 try:
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	317 component.get('validate').config_file("settings.xml","default_settings.xml")
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	318 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	319 txt = ini.read()
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	320 xml = component.get('xml')
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 0 diff changeset	321 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	322 ini.close()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	323 node_list = tree.getElementsByTagName("MetaServerBaseURL")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	324 if node_list:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	325 url = node_list[0].getAttribute("value")
212 13054be69834 Traipse Beta 'OpenRPG' {100428-00} sirebral parents: 184 diff changeset	326 print url
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	327 # allow tree to be collected
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	328 try: tree.unlink()
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	329 except: pass
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	330
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	331 except Exception,e:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	332 print e
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	333 #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	334 return url
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	335
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	336 """
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	337 Beginning of Class registerThread
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	338
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	339 A Class to Manage Registration with the Meta2
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	340 Create an instance and call it's start() method
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	341 if you want to be (and stay) registered. This class
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	342 will take care of registering and re-registering as
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	343 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	344
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	345 You may call register() yourself if you wish to change your
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	346 server's name. It will immediately update the Meta. There
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	347 is no need to unregister first.
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	348
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	349 Call unregister() when you no longer want to be registered.
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	350 This will result in the registerThread dying after
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	351 attempting to immediately remove itself from the Meta.
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	352
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	353 If you need to become registered again after that, you
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	354 must create a new instance of class registerThread. Don't
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	355 just try to call register() on the old, dead thread class.
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	356 """
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	357
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	358 class registerThread(Thread):
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	359 """
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	360 Originally, I wrote this as a sub-class of wxThread, but
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	361 A) I couldn't get it to import right
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	362 B) I realized that I want this to be used in a server,
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	363 which I don't want needing wxWindows to run!
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	364
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	365 Because of this fact, there are some methods from wxThread
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	366 that I implemented to minimize changes to the code I had
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	367 just written, i.e. TestDeleteStatus() and Delete()
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	368 """
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	369
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	370 def __init__(self, name=None, realHostName=None, num_users="0",
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	371 MetaPath=None, port=6774, register_callback=None):
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	372 Thread.__init__(self, name="registerThread")
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	373 self.rlock = RLock() # Re-entrant lock used to make this class thread safe
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	374 self.die_event = Event() # The main loop in run() will wait with timeout on this
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	375 self.name = name or 'Unnamed Server' # Name that the server want's displayed on the Meta
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	376 # But use Unnamed Server if for some crazy reason
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	377 # no name is passed to the constructor
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	378 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	379 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	380 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	381 # indicates a new registration.
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	382 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	383 # indicates a new registration.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	384 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	385 # re-register, in minutes.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	386 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	387 self.port = str(port)
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	388 self.register_callback = register_callback # set a method to call to report result of register
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	389 """
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	390 This thread will communicate with one and only one
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	391 Meta. If the Meta in ini.xml is changed after
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	392 instantiation, then this instance must be
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	393 unregistered and a new instance instantiated.
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	394
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	395 Also, if MetaPath is specified, then use that. Makes
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	396 it easier to have multiple registerThreads going to keep the server registered
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	397 on multiple (compatible) Metas.
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	398 """
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	399 if MetaPath == None: self.path = getMetaServerBaseURL() # Do this if no Meta specified
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	400 else: self.path = MetaPath
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	401
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	402 def getIdAndCookie(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	403 return self.id, self.cookie
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	404
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	405 def TestDeleteStatus(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	406 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	407 self.rlock.acquire()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	408 return self.die_event.isSet()
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	409 finally: self.rlock.release()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	410
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	411 def Delete(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	412 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	413 self.rlock.acquire()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	414 self.die_event.set()
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	415 finally: self.rlock.release()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	416
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	417 def run(self):
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	418 """
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	419 This method gets called by Thread implementation
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	420 when self.start() is called to begin the thread's
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	421 execution
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	422
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	423 We will basically enter a loop that continually
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	424 re-registers this server and sleeps Interval
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	425 minutes until the thread is ordered to die in place
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	426 """
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	427 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	428 # Otherwise, call thread safe register().
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	429 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	430 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	431 # 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	432 # for us, including self.interval.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	433 try:
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	434 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	435
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	436 if self.interval >= 3: # If the number of minutes is one or greater
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	437 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	438 else:
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	439 self.interval = .5 # Otherwise, we probably experienced some kind
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	440 # of error from the Meta in register(). Sleep
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	441 # 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	442
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	443 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	444 # 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	445 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	446
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	447 # 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	448 # 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	449 # calls to Thread.isAlive() return False.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	450
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	451 def unregister(self):
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	452 """
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	453 This method can (I hope) be called from both within the thread
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	454 and from other threads. It will attempt to unregister this
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	455 server from the Meta database
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	456 When this is either accomplished or has been tried hard enough
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	457 (after which it just makes sense to let the Meta remove the
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	458 entry itself when we don't re-register using this id),
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	459 this method will either cause the thread to immediately die
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	460 (if called from this thread's context) or set the Destroy flag
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	461 (if called from the main thread), a positive test for which will cause
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	462 the code in Entry() to exit() when the thread wakes up and
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	463 checks TestDeleteStatus().
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	464 lock the critical section. The unlock will
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	465 automatically occur at the end of the function in the finally clause
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	466 """
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	467 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	468 self.rlock.acquire()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	469 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	470 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	471 # Do the actual unregistering here
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	472 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	473 "server_data[cookie]":self.cookie,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	474 "server_data[version]":PROTOCOL_VERSION,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	475 "act":"unregister"} )
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	476 try: # this POSTS the request and returns the result
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	477 xml_dom = get_server_dom(data=data, path=self.path)
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	478 if xml_dom.get("errmsg"):
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	479 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	480 except:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	481 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	482 # 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	483
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	484 # 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	485 # 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	486 # 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	487 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	488 # prep xml_dom for garbage collection
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	489 try: xml_dom.unlink()
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	490 except: pass
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	491 return 0
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	492 finally: self.rlock.release()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	493
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	494 def register(self, name=None, realHostName=None, num_users=None):
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	495 """
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	496 Designed to handle the registration, both new and
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	497 repeated.
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	498
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	499 It is intended to be called once every interval
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	500 (or interval - delta) minutes.
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	501
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	502 lock the critical section. The unlock will
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	503 automatically occur at the end of the function in the finally clause
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	504 """
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	505 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	506 self.rlock.acquire()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	507 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	508 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	509
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	510 # Set the server's attibutes, if specified.
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	511 if name: self.name = name
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	512 if num_users != None: self.num_users = num_users
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	513 if realHostName: self.realHostName = realHostName
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	514 # build POST data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	515 if self.realHostName:
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	516 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	517 "server_data[cookie]":self.cookie,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	518 "server_data[name]":self.name,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	519 "server_data[port]":self.port,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	520 "server_data[version]":PROTOCOL_VERSION,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	521 "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	522 "act":"register",
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	523 "server_data[address]": self.realHostName } )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	524 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	525 if META_DEBUG: print "Letting meta server decide the hostname to list..."
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	526 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	527 "server_data[cookie]":self.cookie,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	528 "server_data[name]":self.name,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	529 "server_data[port]":self.port,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	530 "server_data[version]":PROTOCOL_VERSION,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	531 "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	532 "act":"register"} )
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	533 try: # this POSTS the request and returns the result
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	534 etreeEl = get_server_dom(data=data, path=self.path)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	535 except:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	536 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	537 if META_DEBUG: print data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	538 if META_DEBUG: print
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	539 self.interval = 0
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	540 """
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	541 If we are in the registerThread thread, then setting interval to 0
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	542 will end up causing a retry in about 6 seconds (see self.run())
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	543 If we are in the main thread, then setting interval to 0 will do one
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	544 of two things:
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	545 1) Do the same as if we were in the registerThread
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	546 2) Cause the next, normally scheduled register() call to use the values
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	547 provided in this call.
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	548
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	549 Which case occurs depends on where the registerThread thread is when
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	550 the main thread calls register().
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	551 """
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	552 return 0 # indicates that it was okay to call, not that no errors occurred
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	553
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	554 # If there is a DOM returned ....
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	555 if etreeEl:
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	556 # If there's an error, echo it to the console
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	557 if etreeEl.get("errmsg"):
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	558 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	559 if META_DEBUG: print data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	560 if META_DEBUG: print
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	561 """
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	562 No special handling is required. If the registration worked, id, cookie, and interval
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	563 can be stored and used for the next time.
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	564 If an error occurred, then the Meta will delete us and we need to re-register as
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	565 a new server. The way to indicate this is with a "0" id and "0" cookie sent to
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	566 the server during the next registration. Since that's what the server returns to
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	567 us on an error anyway, we just store them and the next registration will
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	568 automatically be set up as a new one.
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	569
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	570 Unless the server calls register() itself in the meantime. Of course, that's okay
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	571 too, because a success on THAT register() call will set up the next one to use
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	572 the issued id and cookie.
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	573
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	574 The interval is stored unconditionally for similar reasons. If there's an error,
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	575 the interval will be less than 1, and the main thread's while loop will reset it
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	576 to 6 seconds for the next retry.
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	577 Is it wrong to have a method where there's more comments than code? :)
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	578 """
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	579 try:
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	580 self.interval = int(etreeEl.get("interval"))
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	581 self.id = etreeEl.get("id")
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	582 self.cookie = etreeEl.get("cookie")
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	583 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	584 except:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	585 if META_DEBUG: print
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	586 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	587 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	588 # Let xml_dom get garbage collected
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	589 try: xml_dom.unlink()
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	590 except: pass
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	591 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	592 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	593 return 0 # Let caller know it was okay to call us
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	594 finally: self.rlock.release()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	595 # End of class registerThread
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	596 ################################################################################

Mercurial > traipse_dev

annotate orpg/networking/meta_server_lib.py @ 226:b29454610f36 beta