Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

1 files changed, 96 insertions, 72 deletions

diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 5540656..5e62f23 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -35,15 +35,20 @@ using System.Xml;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
+using Mono.Addins;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.DataSnapshot.Interfaces;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
+[assembly: Addin("DataSnapshot", "0.1")]
+[assembly: AddinDependency("OpenSim", "0.5")]
+
 namespace OpenSim.Region.DataSnapshot
 {
-    public class DataSnapshotManager : IRegionModule, IDataSnapshot
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DataSnapshotManager")]
+    public class DataSnapshotManager : ISharedRegionModule, IDataSnapshot
     {
         #region Class members
         //Information from config
@@ -67,6 +72,7 @@ namespace OpenSim.Region.DataSnapshot
         public string m_listener_port = ConfigSettings.DefaultRegionHttpPort.ToString();
         public string m_hostname = "127.0.0.1";
         private UUID m_Secret = UUID.Random();
+        private bool m_servicesNotified = false;
 
         //Update timers
         private int m_period = 20; // in seconds
@@ -93,9 +99,9 @@ namespace OpenSim.Region.DataSnapshot
 
         #endregion
 
-        #region IRegionModule
+        #region Region Module interface
 
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
         {
             if (!m_configLoaded) 
             {
@@ -133,82 +139,128 @@ namespace OpenSim.Region.DataSnapshot
                         m_enabled = false;
                         return;
                     }
-                }
 
-                if (m_enabled)
-                {
-                    //Hand it the first scene, assuming that all scenes have the same BaseHTTPServer
-                    new DataRequestHandler(scene, this);
+                    if (m_enabled)
+                        m_snapStore = new SnapshotStore(m_snapsDir, m_gridinfo, m_listener_port, m_hostname);
+                }
 
-                    m_hostname = scene.RegionInfo.ExternalHostName;
-                    m_snapStore = new SnapshotStore(m_snapsDir, m_gridinfo, m_listener_port, m_hostname);
+            }
 
-                    MakeEverythingStale();
+        }
 
-                    if (m_dataServices != "" &&  m_dataServices != "noservices")
-                        NotifyDataServices(m_dataServices, "online");
-                }
-            }
+        public void AddRegion(Scene scene)
+        {
+            if (!m_enabled)
+                return;
 
-            if (m_enabled)
-            {
-                m_log.Info("[DATASNAPSHOT]: Scene added to module.");
+            m_log.DebugFormat("[DATASNAPSHOT]: Module added to Scene {0}.", scene.RegionInfo.RegionName);
 
-                m_snapStore.AddScene(scene);
-                m_scenes.Add(scene);
+            m_snapStore.AddScene(scene);
+            m_scenes.Add(scene);
 
-                Assembly currentasm = Assembly.GetExecutingAssembly();
+            Assembly currentasm = Assembly.GetExecutingAssembly();
 
-                foreach (Type pluginType in currentasm.GetTypes())
+            foreach (Type pluginType in currentasm.GetTypes())
+            {
+                if (pluginType.IsPublic)
                 {
-                    if (pluginType.IsPublic)
+                    if (!pluginType.IsAbstract)
                     {
-                        if (!pluginType.IsAbstract)
+                        if (pluginType.GetInterface("IDataSnapshotProvider") != null)
                         {
-                            if (pluginType.GetInterface("IDataSnapshotProvider") != null)
-                            {
-                                IDataSnapshotProvider module = (IDataSnapshotProvider)Activator.CreateInstance(pluginType);
-                                module.Initialize(scene, this);
-                                module.OnStale += MarkDataStale;
+                            IDataSnapshotProvider module = (IDataSnapshotProvider)Activator.CreateInstance(pluginType);
+                            module.Initialize(scene, this);
+                            module.OnStale += MarkDataStale;
 
-                                m_dataproviders.Add(module);
-                                m_snapStore.AddProvider(module);
+                            m_dataproviders.Add(module);
+                            m_snapStore.AddProvider(module);
 
-                                m_log.Info("[DATASNAPSHOT]: Added new data provider type: " + pluginType.Name);
-                            }
+                            m_log.Debug("[DATASNAPSHOT]: Added new data provider type: " + pluginType.Name);
                         }
                     }
                 }
+            }
+
+            // Must be done here because on shared modules, PostInitialise() will run
+            // BEFORE any scenes are registered. There is no "all scenes have been loaded"
+            // kind of callback because scenes may be created dynamically, so we cannot
+            // have that info, ever.
+            if (!m_servicesNotified)
+            {
+                //Hand it the first scene, assuming that all scenes have the same BaseHTTPServer
+                new DataRequestHandler(m_scenes[0], this);
+
+                m_hostname = m_scenes[0].RegionInfo.ExternalHostName;
 
-                //scene.OnRestart += OnSimRestart;
-                scene.EventManager.OnShutdown += delegate() { OnSimRestart(scene.RegionInfo); };
+                if (m_dataServices != "" && m_dataServices != "noservices")
+                    NotifyDataServices(m_dataServices, "online");
+
+                m_servicesNotified = true;
             }
-            else
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            if (!m_enabled)
+                return;
+
+            m_log.Info("[DATASNAPSHOT]: Region " + scene.RegionInfo.RegionName + " is being removed, removing from indexing");
+            Scene restartedScene = SceneForUUID(scene.RegionInfo.RegionID);
+
+            m_scenes.Remove(restartedScene);
+            m_snapStore.RemoveScene(restartedScene);
+
+            //Getting around the fact that we can't remove objects from a collection we are enumerating over
+            List<IDataSnapshotProvider> providersToRemove = new List<IDataSnapshotProvider>();
+
+            foreach (IDataSnapshotProvider provider in m_dataproviders)
+            {
+                if (provider.GetParentScene == restartedScene)
+                {
+                    providersToRemove.Add(provider);
+                }
+            }
+
+            foreach (IDataSnapshotProvider provider in providersToRemove)
             {
-                //m_log.Debug("[DATASNAPSHOT]: Data snapshot disabled, not adding scene to module (or anything else).");
+                m_dataproviders.Remove(provider);
+                m_snapStore.RemoveProvider(provider);
             }
+
+            m_snapStore.RemoveScene(restartedScene);
         }
 
-        public void Close() 
+        public void PostInitialise()
         {
-            if (m_enabled && m_dataServices != "" && m_dataServices != "noservices")
-                NotifyDataServices(m_dataServices, "offline");
         }
 
+        public void RegionLoaded(Scene scene)
+        {
+            if (!m_enabled)
+                return;
+
+            m_log.DebugFormat("[DATASNAPSHOT]: Marking scene {0} as stale.", scene.RegionInfo.RegionName);
+            m_snapStore.ForceSceneStale(scene);
+        }
 
-        public bool IsSharedModule
+        public void Close() 
         {
-            get { return true; }
+            if (!m_enabled)
+                return;
+
+            if (m_enabled && m_dataServices != "" && m_dataServices != "noservices")
+                NotifyDataServices(m_dataServices, "offline");
         }
 
+
         public string Name
         {
             get { return "External Data Generator"; }
         }
 
-        public void PostInitialise()
+        public Type ReplaceableInterface
         {
-
+            get { return null; }
         }
 
         #endregion
@@ -399,35 +451,7 @@ namespace OpenSim.Region.DataSnapshot
                 m_snapStore.ForceSceneStale(scene);
             }
         }
-
         #endregion
 
-        public void OnSimRestart(RegionInfo thisRegion)
-        {
-            m_log.Info("[DATASNAPSHOT]: Region " + thisRegion.RegionName + " is restarting, removing from indexing");
-            Scene restartedScene = SceneForUUID(thisRegion.RegionID);
-
-            m_scenes.Remove(restartedScene);
-            m_snapStore.RemoveScene(restartedScene);
-
-            //Getting around the fact that we can't remove objects from a collection we are enumerating over
-            List<IDataSnapshotProvider> providersToRemove = new List<IDataSnapshotProvider>();
-
-            foreach (IDataSnapshotProvider provider in m_dataproviders)
-            {
-                if (provider.GetParentScene == restartedScene)
-                {
-                    providersToRemove.Add(provider);
-                }
-            }
-
-            foreach (IDataSnapshotProvider provider in providersToRemove)
-            {
-                m_dataproviders.Remove(provider);
-                m_snapStore.RemoveProvider(provider);
-            }
-
-            m_snapStore.RemoveScene(restartedScene);
-        }
     }
 }