X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=lib%2Fmudpy%2Fmisc.py;h=6c720d53f7af78a2d0235f20358046d0c04f762d;hp=28b92fb6c726e1e4adc39de4e908545b744e5f39;hb=4708e5ad2215bce4806578c9417a09ceccef0292;hpb=84f2fa2376d2202d09fea78e499fc644454a79ba diff --git a/lib/mudpy/misc.py b/lib/mudpy/misc.py index 28b92fb..6c720d5 100644 --- a/lib/mudpy/misc.py +++ b/lib/mudpy/misc.py @@ -1,7 +1,6 @@ -# -*- coding: utf-8 -*- """Miscellaneous functions for the mudpy engine.""" -# Copyright (c) 2004-2014 Jeremy Stanley . Permission +# Copyright (c) 2004-2016 Jeremy Stanley . Permission # to use, copy, modify, and distribute this software is granted under # terms provided in the LICENSE file distributed with this software. @@ -24,9 +23,12 @@ class Element: """An element of the universe.""" - def __init__(self, key, universe, filename=None): + def __init__(self, key, universe, filename=None, old_style=False): """Set up a new element.""" + # TODO(fungi): This can be removed after the transition is complete + self.old_style = old_style + # keep track of our key name self.key = key @@ -34,7 +36,7 @@ class Element: self.universe = universe # clone attributes if this is replacing another element - if self.key in self.universe.contents: + if self.old_style and self.key in self.universe.contents: old_element = self.universe.contents[self.key] for attribute in vars(old_element).keys(): exec("self." + attribute + " = old_element." + attribute) @@ -44,6 +46,9 @@ class Element: # i guess this is a new element then else: + # set of facet keys from the universe + self.facethash = dict() + # not owned by a user by default (used for avatars) self.owner = None @@ -74,8 +79,8 @@ class Element: self.origin = self.universe.files[filename] # add a data section to the origin if necessary - if not self.origin.data.has_section(self.key): - self.origin.data.add_section(self.key) + if self.key not in self.origin.data: + self.origin.data[self.key] = {} # add or replace this element in the universe self.universe.contents[self.key] = self @@ -83,22 +88,26 @@ class Element: def reload(self): """Create a new element and replace this one.""" - Element(self.key, self.universe, self.origin.filename) + Element(self.key, self.universe, self.origin.filename, + old_style=self.old_style) del(self) def destroy(self): """Remove an element from the universe and destroy it.""" - self.origin.data.remove_section(self.key) + del(self.origin.data[self.key]) del self.universe.categories[self.category][self.subkey] del self.universe.contents[self.key] del self def facets(self): """Return a list of non-inherited facets for this element.""" - if self.key in self.origin.data.sections(): - return self.origin.data.options(self.key) + if self.old_style: + try: + return self.origin.data[self.key].keys() + except (AttributeError, KeyError): + return [] else: - return [] + return self.facethash def has_facet(self, facet): """Return whether the non-inherited facet exists.""" @@ -107,13 +116,15 @@ class Element: def remove_facet(self, facet): """Remove a facet from the element.""" if self.has_facet(facet): - self.origin.data.remove_option(self.key, facet) + del(self.origin.data[self.key][facet]) self.origin.modified = True def ancestry(self): """Return a list of the element's inheritance lineage.""" if self.has_facet("inherit"): - ancestry = self.getlist("inherit") + ancestry = self.get("inherit") + if not ancestry: + ancestry = [] for parent in ancestry[:]: ancestors = self.universe.contents[parent].ancestry() for ancestor in ancestors: @@ -127,91 +138,40 @@ class Element: """Retrieve values.""" if default is None: default = "" - if self.origin.data.has_option(self.key, facet): - raw_data = self.origin.data.get(self.key, facet) - if raw_data.startswith("u\"") or raw_data.startswith("u'"): - raw_data = raw_data[1:] - raw_data.strip("\"'") - return raw_data - elif self.has_facet("inherit"): + try: + if self.old_style: + return self.origin.data[self.key][facet] + else: + return self.origin.data[".".join((self.key, facet))] + except (KeyError, TypeError): + pass + if self.has_facet("inherit"): for ancestor in self.ancestry(): if self.universe.contents[ancestor].has_facet(facet): return self.universe.contents[ancestor].get(facet) else: return default - def getboolean(self, facet, default=None): - """Retrieve values as boolean type.""" - if default is None: - default = False - if self.origin.data.has_option(self.key, facet): - return self.origin.data.getboolean(self.key, facet) - elif self.has_facet("inherit"): - for ancestor in self.ancestry(): - if self.universe.contents[ancestor].has_facet(facet): - return self.universe.contents[ancestor].getboolean(facet) - else: - return default - - def getint(self, facet, default=None): - """Return values as int type.""" - if default is None: - default = 0 - if self.origin.data.has_option(self.key, facet): - return self.origin.data.getint(self.key, facet) - elif self.has_facet("inherit"): - for ancestor in self.ancestry(): - if self.universe.contents[ancestor].has_facet(facet): - return self.universe.contents[ancestor].getint(facet) - else: - return default - - def getfloat(self, facet, default=None): - """Return values as float type.""" - if default is None: - default = 0.0 - if self.origin.data.has_option(self.key, facet): - return self.origin.data.getfloat(self.key, facet) - elif self.has_facet("inherit"): - for ancestor in self.ancestry(): - if self.universe.contents[ancestor].has_facet(facet): - return self.universe.contents[ancestor].getfloat(facet) - else: - return default - - def getlist(self, facet, default=None): - """Return values as list type.""" - if default is None: - default = [] - value = self.get(facet) - if value: - return mudpy.data.makelist(value) - else: - return default - - def getdict(self, facet, default=None): - """Return values as dict type.""" - if default is None: - default = {} - value = self.get(facet) - if value: - return mudpy.data.makedict(value) - else: - return default - def set(self, facet, value): """Set values.""" if not self.has_facet(facet) or not self.get(facet) == value: - if not type(value) is str: - value = repr(value) - self.origin.data.set(self.key, facet, value) + if self.old_style: + if self.key not in self.origin.data: + self.origin.data[self.key] = {} + self.origin.data[self.key][facet] = value + else: + node = ".".join((self.key, facet)) + self.origin.data[node] = value + self.facethash[node] = self.origin.data[node] self.origin.modified = True def append(self, facet, value): """Append value to a list.""" - if not type(value) is str: - value = repr(value) - newlist = self.getlist(facet) + newlist = self.get(facet) + if not newlist: + newlist = [] + if type(newlist) is not list: + newlist = list(newlist) newlist.append(value) self.set(facet, newlist) @@ -247,11 +207,11 @@ class Element: result = False # avatars of administrators can run any command - elif self.owner and self.owner.account.getboolean("administrator"): + elif self.owner and self.owner.account.get("administrator"): result = True # everyone can run non-administrative commands - elif not command.getboolean("administrative"): + elif not command.get("administrative"): result = True # otherwise the command cannot be run by this actor @@ -292,48 +252,17 @@ class Element: def move_direction(self, direction): """Relocate the element in a specified direction.""" - self.echo_to_location( - self.get( - "name" - ) + " exits " + self.universe.categories[ - "internal" - ][ - "directions" - ].getdict( - direction - )[ - "exit" - ] + "." - ) - self.send( - "You exit " + self.universe.categories[ - "internal" - ][ - "directions" - ].getdict( - direction - )[ - "exit" - ] + ".", - add_prompt=False - ) + motion = self.universe.contents["mudpy.movement.%s" % direction] + enter_term = motion.get("enter_term") + exit_term = motion.get("exit_term") + self.echo_to_location("%s exits %s." % (self.get("name"), exit_term)) + self.send("You exit %s." % exit_term, add_prompt=False) self.go_to( self.universe.contents[ self.get("location")].link_neighbor(direction) ) - self.echo_to_location( - self.get( - "name" - ) + " arrives from " + self.universe.categories[ - "internal" - ][ - "directions" - ].getdict( - direction - )[ - "enter" - ] + "." - ) + self.echo_to_location("%s arrives from %s." % ( + self.get("name"), enter_term)) def look_at(self, key): """Show an element to another element.""" @@ -355,7 +284,7 @@ class Element: for element in self.universe.contents[ self.get("location") ].contents.values(): - if element.getboolean("is_actor") and element is not self: + if element.get("is_actor") and element is not self: message += "$(yel)" + element.get( "name" ) + " is here.$(nrm)$(eol)" @@ -371,15 +300,10 @@ class Element: if re.match("""^area:-?\d+,-?\d+,-?\d+$""", self.key): coordinates = [(int(x)) for x in self.key.split(":")[1].split(",")] - directions = self.universe.categories["internal"]["directions"] - offsets = dict( - [ - ( - x, directions.getdict(x)["vector"] - ) for x in directions.facets() - ] - ) - for portal in self.getlist("gridlinks"): + offsets = dict((x, + self.universe.contents["mudpy.movement.%s" % x].get("vector") + ) for x in self.universe.directions) + for portal in self.get("gridlinks"): adjacent = map(lambda c, o: c + o, coordinates, offsets[portal]) neighbor = "area:" + ",".join( @@ -419,23 +343,21 @@ class Universe: self.categories = {} self.contents = {} self.default_origins = {} + self.directions = set() self.loglines = [] self.private_files = [] self.reload_flag = False + self.setup_loglines = [] self.startdir = os.getcwd() self.terminate_flag = False self.userlist = [] if not filename: possible_filenames = [ - ".mudpyrc", - ".mudpy/mudpyrc", - ".mudpy/mudpy.conf", - "mudpy.conf", - "etc/mudpy.conf", - "/usr/local/mudpy/mudpy.conf", - "/usr/local/mudpy/etc/mudpy.conf", - "/etc/mudpy/mudpy.conf", - "/etc/mudpy.conf" + "etc/mudpy.yaml", + "/usr/local/mudpy/etc/mudpy.yaml", + "/usr/local/etc/mudpy.yaml", + "/etc/mudpy/mudpy.yaml", + "/etc/mudpy.yaml" ] for filename in possible_filenames: if os.access(filename, os.R_OK): @@ -444,11 +366,15 @@ class Universe: filename = os.path.join(self.startdir, filename) self.filename = filename if load: - self.load() + # make sure to preserve any accumulated log entries during load + self.setup_loglines += self.load() def load(self): """Load universe data from persistent storage.""" + # it's possible for this to enter before logging configuration is read + pending_loglines = [] + # the files dict must exist and filename needs to be read-only if not hasattr( self, "files" @@ -470,9 +396,13 @@ class Universe: # make a list of inactive avatars inactive_avatars = [] for account in self.categories["account"].values(): - inactive_avatars += [ - (self.contents[x]) for x in account.getlist("avatars") - ] + for avatar in account.get("avatars"): + try: + inactive_avatars.append(self.contents[avatar]) + except KeyError: + pending_loglines.append(( + "Missing avatar \"%s\", possible data corruption" % + avatar, 6)) for user in self.userlist: if user.avatar in inactive_avatars: inactive_avatars.remove(user.avatar) @@ -485,13 +415,14 @@ class Universe: area ].contents: del self.contents[area].contents[element.key] - element.set("default_location", location) + element.set("default_location", area) element.remove_facet("location") # another pass to straighten out all the element contents for element in self.contents.values(): element.update_location() element.clean_contents() + return pending_loglines def new(self): """Create a new, empty Universe (the Big Bang).""" @@ -511,8 +442,8 @@ class Universe: """Create and open the listening socket.""" # need to know the local address and port number for the listener - host = self.categories["internal"]["network"].get("host") - port = self.categories["internal"]["network"].getint("port") + host = self.contents["mudpy.network"].get("host") + port = self.contents["mudpy.network"].get("port") # if no host was specified, bind to all local addresses (preferring # ipv6) @@ -555,7 +486,7 @@ class Universe: def get_time(self): """Convenience method to get the elapsed time counter.""" - return self.categories["internal"]["counters"].getint("elapsed") + return self.categories["internal"]["counters"].get("elapsed") class User: @@ -602,7 +533,7 @@ class User: def check_idle(self): """Warn or disconnect idle users as appropriate.""" idletime = universe.get_time() - self.last_input - linkdead_dict = universe.categories["internal"]["time"].getdict( + linkdead_dict = universe.categories["internal"]["time"].get( "linkdead" ) if self.state in linkdead_dict: @@ -626,7 +557,7 @@ class User: log(logline, 2) self.state = "disconnecting" self.menu_seen = False - idle_dict = universe.categories["internal"]["time"].getdict("idle") + idle_dict = universe.categories["internal"]["time"].get("idle") if self.state in idle_dict: idle_state = self.state else: @@ -719,13 +650,8 @@ class User: if self.state is not "authenticated": log("User " + self.account.get("name") + " logged in.", 2) self.authenticated = True - if self.account.subkey in universe.categories[ - "internal" - ][ - "limits" - ].getlist( - "default_admins" - ): + if self.account.subkey in universe.contents["mudpy.limit"].get( + "admins"): self.account.set("administrator", "True") def show_menu(self): @@ -892,14 +818,14 @@ class User: if self.output_queue: try: self.connection.send(self.output_queue[0]) - del self.output_queue[0] except BrokenPipeError: if self.account and self.account.get("name"): account = self.account.get("name") else: account = "an unknown user" - log("Broken pipe sending to %s." % account, 7) self.state = "disconnecting" + log("Broken pipe sending to %s." % account, 7) + del self.output_queue[0] def enqueue_input(self): """Process and enqueue any new input.""" @@ -942,8 +868,7 @@ class User: # log non-printable characters remaining if mudpy.telnet.is_enabled(self, mudpy.telnet.TELOPT_BINARY, mudpy.telnet.HIM): - asciiline = b"".join( - filter(lambda x: b" " <= x <= b"~", line)) + asciiline = bytes([x for x in line if 32 <= x <= 126]) if line != asciiline: logline = "Non-ASCII characters from " if self.account and self.account.get("name"): @@ -982,7 +907,7 @@ class User: "actor:avatar:" + self.account.get("name") + ":" + str( counter ), - universe + universe, old_style=True ) self.avatar.append("inherit", "archetype:avatar") self.account.append("avatars", self.avatar.key) @@ -992,14 +917,14 @@ class User: if self.avatar is universe.contents[avatar]: self.avatar = None universe.contents[avatar].destroy() - avatars = self.account.getlist("avatars") + avatars = self.account.get("avatars") avatars.remove(avatar) self.account.set("avatars", avatars) def activate_avatar_by_index(self, index): """Enter the world with a particular indexed avatar.""" self.avatar = universe.contents[ - self.account.getlist("avatars")[index]] + self.account.get("avatars")[index]] self.avatar.owner = self self.state = "active" self.avatar.go_home() @@ -1022,17 +947,20 @@ class User: def destroy(self): """Destroy the user and associated avatars.""" - for avatar in self.account.getlist("avatars"): + for avatar in self.account.get("avatars"): self.delete_avatar(avatar) self.account.destroy() def list_avatar_names(self): """List names of assigned avatars.""" - return [ - universe.contents[avatar].get( - "name" - ) for avatar in self.account.getlist("avatars") - ] + avatars = [] + for avatar in self.account.get("avatars"): + try: + avatars.append(universe.contents[avatar].get("name")) + except KeyError: + log("Missing avatar \"%s\", possible data corruption." % + avatar, 6) + return avatars def broadcast(message, add_prompt=True): @@ -1045,17 +973,13 @@ def log(message, level=0): """Log a message.""" # a couple references we need - file_name = universe.categories["internal"]["logging"].get("file") - max_log_lines = universe.categories["internal"]["logging"].getint( - "max_log_lines" - ) - syslog_name = universe.categories["internal"]["logging"].get("syslog") + file_name = universe.contents["mudpy.log"].get("file") + max_log_lines = universe.contents["mudpy.log"].get("lines") + syslog_name = universe.contents["mudpy.log"].get("syslog") timestamp = time.asctime()[4:19] - # turn the message into a list of lines - lines = filter( - lambda x: x != "", [(x.rstrip()) for x in message.split("\n")] - ) + # turn the message into a list of nonempty lines + lines = [x for x in [(x.rstrip()) for x in message.split("\n")] if x != ""] # send the timestamp and line to a file if file_name: @@ -1068,7 +992,7 @@ def log(message, level=0): file_descriptor.close() # send the timestamp and line to standard output - if universe.categories["internal"]["logging"].getboolean("stdout"): + if universe.contents["mudpy.log"].get("stdout"): for line in lines: print(timestamp + " " + line) @@ -1085,9 +1009,9 @@ def log(message, level=0): # display to connected administrators for user in universe.userlist: - if user.state == "active" and user.account.getboolean( + if user.state == "active" and user.account.get( "administrator" - ) and user.account.getint("loglevel") <= level: + ) and user.account.get("loglevel", 0) <= level: # iterate over every line in the message full_message = "" for line in lines: @@ -1107,7 +1031,7 @@ def get_loglines(level, start, stop): """Return a specific range of loglines filtered by level.""" # filter the log lines - loglines = filter(lambda x: x[0] >= level, universe.loglines) + loglines = [x for x in universe.loglines if x[0] >= level] # we need these in several places total_count = str(len(universe.loglines)) @@ -1393,9 +1317,12 @@ def replace_macros(user, text, is_input=False): return text -def escape_macros(text): +def escape_macros(value): """Escapes replacement macros in text.""" - return text.replace("$(", "$_(") + if type(value) is str: + return value.replace("$(", "$_(") + else: + return value def first_word(text, separator=" "): @@ -1428,47 +1355,47 @@ def on_pulse(): # add an element for counters if it doesn't exist if "counters" not in universe.categories["internal"]: universe.categories["internal"]["counters"] = Element( - "internal:counters", universe + "internal:counters", universe, old_style=True ) # update the log every now and then - if not universe.categories["internal"]["counters"].getint("mark"): + if not universe.categories["internal"]["counters"].get("mark"): log(str(len(universe.userlist)) + " connection(s)") universe.categories["internal"]["counters"].set( - "mark", universe.categories["internal"]["time"].getint( + "mark", universe.categories["internal"]["time"].get( "frequency_log" ) ) else: universe.categories["internal"]["counters"].set( - "mark", universe.categories["internal"]["counters"].getint( + "mark", universe.categories["internal"]["counters"].get( "mark" ) - 1 ) # periodically save everything - if not universe.categories["internal"]["counters"].getint("save"): + if not universe.categories["internal"]["counters"].get("save"): universe.save() universe.categories["internal"]["counters"].set( - "save", universe.categories["internal"]["time"].getint( + "save", universe.categories["internal"]["time"].get( "frequency_save" ) ) else: universe.categories["internal"]["counters"].set( - "save", universe.categories["internal"]["counters"].getint( + "save", universe.categories["internal"]["counters"].get( "save" ) - 1 ) # pause for a configurable amount of time (decimal seconds) time.sleep(universe.categories["internal"] - ["time"].getfloat("increment")) + ["time"].get("increment")) # increase the elapsed increment counter universe.categories["internal"]["counters"].set( - "elapsed", universe.categories["internal"]["counters"].getint( - "elapsed" + "elapsed", universe.categories["internal"]["counters"].get( + "elapsed", 0 ) + 1 ) @@ -1543,7 +1470,7 @@ def get_menu(state, error=None, choices=None): def menu_echo_on(state): """True if echo is on, false if it is off.""" - return universe.categories["menu"][state].getboolean("echo", True) + return universe.categories["menu"][state].get("echo", True) def get_echo_message(state): @@ -1766,7 +1693,7 @@ def handler_entering_account_name(user): # otherwise, this could be a brand new user else: - user.account = Element("account:" + name, universe) + user.account = Element("account:" + name, universe, old_style=True) user.account.set("name", name) log("New user: " + name, 2) user.state = "checking_new_account_name" @@ -1791,13 +1718,8 @@ def handler_checking_password(user): user.state = "main_utility" # if at first your hashes don't match, try, try again - elif user.password_tries < universe.categories[ - "internal" - ][ - "limits" - ].getint( - "password_tries" - ) - 1: + elif user.password_tries < universe.contents["mudpy.limit"].get( + "password_tries") - 1: user.password_tries += 1 user.error = "incorrect" @@ -1830,13 +1752,8 @@ def handler_entering_new_password(user): user.state = "verifying_new_password" # the password was weak, try again if you haven't tried too many times - elif user.password_tries < universe.categories[ - "internal" - ][ - "limits" - ].getint( - "password_tries" - ) - 1: + elif user.password_tries < universe.contents["mudpy.limit"].get( + "password_tries") - 1: user.password_tries += 1 user.error = "weak" @@ -1865,13 +1782,8 @@ def handler_verifying_new_password(user): # go back to entering the new password as long as you haven't tried # too many times - elif user.password_tries < universe.categories[ - "internal" - ][ - "limits" - ].getint( - "password_tries" - ) - 1: + elif user.password_tries < universe.contents["mudpy.limit"].get( + "password_tries") - 1: user.password_tries += 1 user.error = "differs" user.state = "entering_new_password" @@ -1989,7 +1901,7 @@ def command_help(actor, parameters): description = command.get("description") if not description: description = "(no short description provided)" - if command.getboolean("administrative"): + if command.get("administrative"): output = "$(red)" else: output = "$(grn)" @@ -2002,7 +1914,7 @@ def command_help(actor, parameters): output += help_text # list related commands - see_also = command.getlist("see_also") + see_also = command.get("see_also") if see_also: really_see_also = "" for item in see_also: @@ -2011,7 +1923,7 @@ def command_help(actor, parameters): if actor.can_run(command): if really_see_also: really_see_also += ", " - if command.getboolean("administrative"): + if command.get("administrative"): really_see_also += "$(red)" else: really_see_also += "$(grn)" @@ -2036,7 +1948,7 @@ def command_help(actor, parameters): description = command.get("description") if not description: description = "(no short description provided)" - if command.getboolean("administrative"): + if command.get("administrative"): output += " $(red)" else: output += " $(grn)" @@ -2085,14 +1997,16 @@ def command_say(actor, parameters): if message: # match the punctuation used, if any, to an action - actions = universe.categories["internal"]["language"].getdict( + actions = universe.contents["mudpy.linguistic"].get( "actions" ) default_punctuation = ( - universe.categories["internal"]["language"].get( + universe.contents["mudpy.linguistic"].get( "default_punctuation")) action = "" - for mark in actions.keys(): + + # reverse sort punctuation options so the longest match wins + for mark in sorted(actions.keys(), reverse=True): if not literal and message.endswith(mark): action = actions[mark] break @@ -2112,7 +2026,7 @@ def command_say(actor, parameters): message = message[0].lower() + message[1:] # iterate over all words in message, replacing typos - typos = universe.categories["internal"]["language"].getdict( + typos = universe.contents["mudpy.linguistic"].get( "typos" ) words = message.split() @@ -2203,7 +2117,7 @@ def command_show(actor, parameters): elif arguments[1] in universe.files: message = ("These are the elements in the \"" + arguments[1] + "\" file:$(eol)") - elements = universe.files[arguments[1]].data.sections() + elements = universe.files[arguments[1]].data.keys() elements.sort() for element in elements: message += "$(eol) $(grn)" + element + "$(nrm)" @@ -2212,16 +2126,19 @@ def command_show(actor, parameters): elif arguments[0] == "element": if len(arguments) != 2: message = "You must specify one element." - elif arguments[1] in universe.contents: - element = universe.contents[arguments[1]] + elif arguments[1].strip(".") in universe.contents: + element = universe.contents[arguments[1].strip(".")] message = ("These are the properties of the \"" + arguments[1] + "\" element (in \"" + element.origin.filename + "\"):$(eol)") facets = element.facets() - facets.sort() - for facet in facets: - message += ("$(eol) $(grn)" + facet + ": $(red)" - + escape_macros(element.get(facet)) + "$(nrm)") + for facet in sorted(facets): + if element.old_style: + message += ("$(eol) $(grn)%s: $(red)%s$(nrm)" % + (facet, escape_macros(element.get(facet)))) + else: + message += ("$(eol) $(grn)%s: $(red)%s$(nrm)" % + (facet, str(facets[facet]))) else: message = "Element \"" + arguments[1] + "\" does not exist." elif arguments[0] == "result": @@ -2254,8 +2171,8 @@ def command_show(actor, parameters): level = int(arguments[1]) else: level = -1 - elif 0 <= actor.owner.account.getint("loglevel") <= 9: - level = actor.owner.account.getint("loglevel") + elif 0 <= actor.owner.account.get("loglevel", 0) <= 9: + level = actor.owner.account.get("loglevel", 0) else: level = 1 if level > -1 and start > -1 and stop > -1: @@ -2295,7 +2212,7 @@ def command_create(actor, parameters): " Warning: \"" + filename + "\" is not yet " "included in any other file and will not be read " "on startup unless this is remedied.") - Element(element, universe, filename) + Element(element, universe, filename, old_style=True) log(logline, 6) elif len(arguments) > 2: message = "You can only specify an element and a filename." @@ -2395,7 +2312,7 @@ def daemonize(universe): """Fork and disassociate from everything.""" # only if this is what we're configured to do - if universe.contents["internal:process"].getboolean("daemon"): + if universe.contents["mudpy.process"].get("daemon"): # log before we start forking around, so the terminal gets the message log("Disassociating from the controlling terminal.") @@ -2432,7 +2349,7 @@ def create_pidfile(universe): """Write a file containing the current process ID.""" pid = str(os.getpid()) log("Process ID: " + pid) - file_name = universe.contents["internal:process"].get("pidfile") + file_name = universe.contents["mudpy.process"].get("pidfile") if file_name: if not os.path.isabs(file_name): file_name = os.path.join(universe.startdir, file_name) @@ -2444,7 +2361,7 @@ def create_pidfile(universe): def remove_pidfile(universe): """Remove the file containing the current process ID.""" - file_name = universe.contents["internal:process"].get("pidfile") + file_name = universe.contents["mudpy.process"].get("pidfile") if file_name: if not os.path.isabs(file_name): file_name = os.path.join(universe.startdir, file_name) @@ -2516,6 +2433,11 @@ def setup(): global universe universe = Universe(conffile, True) + # report any loglines which accumulated during setup + for logline in universe.setup_loglines: + log(*logline) + universe.setup_loglines = [] + # log an initial message log("Started mudpy with command line: " + " ".join(sys.argv))