Overhaul data reloading

[mudpy.git] / mudpy / data.py

diff --git a/mudpy/data.py b/mudpy/data.py
index d9eb8eb..6371045 100644 (file)
--- a/mudpy/data.py
+++ b/mudpy/data.py
@@ -1,6 +1,6 @@
 """Data interface functions for the mudpy engine."""
 
-# Copyright (c) 2004-2017 Jeremy Stanley <fungi@yuggoth.org>. Permission
+# Copyright (c) 2004-2018 Jeremy Stanley <fungi@yuggoth.org>. Permission
 # to use, copy, modify, and distribute this software is granted under
 # terms provided in the LICENSE file distributed with this software.
 
@@ -58,15 +58,16 @@ class Data:
                 self.source, relative=self.relative, universe=self.universe)
         try:
             self.data = yaml.safe_load(open(self.source))
+            log_entry = ("Loaded file %s into memory." % self.source, 5)
         except FileNotFoundError:
             # it's normal if the file is one which doesn't exist yet
             self.data = {}
             log_entry = ("File %s is unavailable." % self.source, 6)
-            try:
-                mudpy.misc.log(*log_entry)
-            except NameError:
-                # happens when we're not far enough along in the init process
-                self.universe.setup_loglines.append(log_entry)
+        try:
+            mudpy.misc.log(*log_entry)
+        except NameError:
+            # happens when we're not far enough along in the init process
+            self.universe.setup_loglines.append(log_entry)
         if not hasattr(self.universe, "files"):
             self.universe.files = {}
         self.universe.files[self.source] = self