aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-10-03 15:11:29 +0000
committerJustin Clarke Casey2008-10-03 15:11:29 +0000
commit70124a3213d013098507b08ed7f9301da6845882 (patch)
tree6eb458084e0496be30be166a6da91f50cfb7b1d6 /OpenSim/Grid
parentThis changeset changes the way chat from client is routed: (diff)
downloadopensim-SC-70124a3213d013098507b08ed7f9301da6845882.zip
opensim-SC-70124a3213d013098507b08ed7f9301da6845882.tar.gz
opensim-SC-70124a3213d013098507b08ed7f9301da6845882.tar.bz2
opensim-SC-70124a3213d013098507b08ed7f9301da6845882.tar.xz
* refactor: make startup a template method
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs4
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs4
-rw-r--r--OpenSim/Grid/InventoryServer/Main.cs4
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs6
-rw-r--r--OpenSim/Grid/UserServer/Main.cs4
5 files changed, 5 insertions, 17 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 3f85691..1c9275b 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -80,10 +80,8 @@ namespace OpenSim.Grid.AssetServer
80 MainConsole.Instance = m_console; 80 MainConsole.Instance = m_console;
81 } 81 }
82 82
83 public override void Startup() 83 protected override void StartupSpecific()
84 { 84 {
85 base.Startup();
86
87 AssetConfig config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml"))); 85 AssetConfig config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml")));
88 86
89 m_log.Info("[ASSET]: Setting up asset DB"); 87 m_log.Info("[ASSET]: Setting up asset DB");
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index d83027a..5067a8c 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -73,10 +73,8 @@ namespace OpenSim.Grid.GridServer
73 } 73 }
74 } 74 }
75 75
76 public override void Startup() 76 protected override void StartupSpecific()
77 { 77 {
78 base.Startup();
79
80 m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml"))); 78 m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml")));
81 79
82 SetupGridManager(); 80 SetupGridManager();
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index 3b990e7..8be6a23 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -62,10 +62,8 @@ namespace OpenSim.Grid.InventoryServer
62 MainConsole.Instance = m_console; 62 MainConsole.Instance = m_console;
63 } 63 }
64 64
65 public override void Startup() 65 protected override void StartupSpecific()
66 { 66 {
67 base.Startup();
68
69 InventoryConfig config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml"))); 67 InventoryConfig config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml")));
70 68
71 m_inventoryService = new GridInventoryService(config.UserServerURL); 69 m_inventoryService = new GridInventoryService(config.UserServerURL);
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index c64c74e..27b9346 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -56,8 +56,6 @@ namespace OpenSim.Grid.MessagingServer
56 56
57 m_log.Info("Launching MessagingServer..."); 57 m_log.Info("Launching MessagingServer...");
58 58
59
60
61 OpenMessage_Main messageserver = new OpenMessage_Main(); 59 OpenMessage_Main messageserver = new OpenMessage_Main();
62 60
63 messageserver.Startup(); 61 messageserver.Startup();
@@ -80,10 +78,8 @@ namespace OpenSim.Grid.MessagingServer
80 } 78 }
81 } 79 }
82 80
83 public override void Startup() 81 protected override void StartupSpecific()
84 { 82 {
85 base.Startup();
86
87 Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml"))); 83 Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml")));
88 84
89 m_log.Info("[REGION]: Starting HTTP process"); 85 m_log.Info("[REGION]: Starting HTTP process");
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index d3d5c8c..23df830 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -88,10 +88,8 @@ namespace OpenSim.Grid.UserServer
88 } 88 }
89 } 89 }
90 90
91 public override void Startup() 91 protected override void StartupSpecific()
92 { 92 {
93 base.Startup();
94
95 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml"))); 93 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
96 94
97 m_stats = StatsManager.StartCollectingUserStats(); 95 m_stats = StatsManager.StartCollectingUserStats();