diff options
Diffstat (limited to 'OpenSim/Grid/Manager')
3 files changed, 16 insertions, 15 deletions
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs index da359a7..b6b2b64 100644 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs +++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs | |||
@@ -39,7 +39,7 @@ namespace OpenGridServices.Manager | |||
39 | 39 | ||
40 | protected virtual void OnResponse(object o, Gtk.ResponseArgs args) | 40 | protected virtual void OnResponse(object o, Gtk.ResponseArgs args) |
41 | { | 41 | { |
42 | switch(args.ResponseId) { | 42 | switch (args.ResponseId) { |
43 | case Gtk.ResponseType.Ok: | 43 | case Gtk.ResponseType.Ok: |
44 | MainClass.PendingOperations.Enqueue("connect_to_gridserver " + this.entry1.Text + " " + this.entry2.Text + " " + this.entry3.Text); | 44 | MainClass.PendingOperations.Enqueue("connect_to_gridserver " + this.entry1.Text + " " + this.entry2.Text + " " + this.entry3.Text); |
45 | break; | 45 | break; |
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs index 995dd8c..a386fa8 100644 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs +++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs | |||
@@ -55,7 +55,7 @@ namespace OpenGridServices.Manager | |||
55 | LoginParams.Add(LoginParamsHT); | 55 | LoginParams.Add(LoginParamsHT); |
56 | XmlRpcRequest GridLoginReq = new XmlRpcRequest("manager_login",LoginParams); | 56 | XmlRpcRequest GridLoginReq = new XmlRpcRequest("manager_login",LoginParams); |
57 | XmlRpcResponse GridResp = GridLoginReq.Send(ServerURL,3000); | 57 | XmlRpcResponse GridResp = GridLoginReq.Send(ServerURL,3000); |
58 | if(GridResp.IsFault) { | 58 | if (GridResp.IsFault) { |
59 | connected=false; | 59 | connected=false; |
60 | return false; | 60 | return false; |
61 | } else { | 61 | } else { |
@@ -87,14 +87,15 @@ namespace OpenGridServices.Manager | |||
87 | // TODO - ERROR! | 87 | // TODO - ERROR! |
88 | } | 88 | } |
89 | 89 | ||
90 | for(int i=0; i<=rootnode.ChildNodes.Count; i++) | 90 | for (int i = 0; i <= rootnode.ChildNodes.Count; i++) |
91 | { | 91 | { |
92 | if(rootnode.ChildNodes.Item(i).Name != "region") { | 92 | if (rootnode.ChildNodes.Item(i).Name != "region") |
93 | { | ||
93 | // TODO - ERROR! | 94 | // TODO - ERROR! |
94 | } else { | 95 | } |
96 | else | ||
97 | { | ||
95 | TempRegionData = new RegionBlock(); | 98 | TempRegionData = new RegionBlock(); |
96 | |||
97 | |||
98 | } | 99 | } |
99 | } | 100 | } |
100 | } | 101 | } |
@@ -112,8 +113,8 @@ namespace OpenGridServices.Manager | |||
112 | ShutdownParamsHT["session_id"]=this.SessionID.ToString(); | 113 | ShutdownParamsHT["session_id"]=this.SessionID.ToString(); |
113 | ShutdownParams.Add(ShutdownParamsHT); | 114 | ShutdownParams.Add(ShutdownParamsHT); |
114 | XmlRpcRequest GridShutdownReq = new XmlRpcRequest("shutdown",ShutdownParams); | 115 | XmlRpcRequest GridShutdownReq = new XmlRpcRequest("shutdown",ShutdownParams); |
115 | XmlRpcResponse GridResp = GridShutdownReq.Send(this.ServerURL,3000); | 116 | XmlRpcResponse GridResp = GridShutdownReq.Send(this.ServerURL, 3000); |
116 | if(GridResp.IsFault) { | 117 | if (GridResp.IsFault) { |
117 | return false; | 118 | return false; |
118 | } else { | 119 | } else { |
119 | connected=false; | 120 | connected=false; |
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs index 33e577d..6b7a5ab 100644 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs +++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs | |||
@@ -45,7 +45,7 @@ namespace OpenGridServices.Manager | |||
45 | 45 | ||
46 | public static void DoMainLoop() | 46 | public static void DoMainLoop() |
47 | { | 47 | { |
48 | while(!QuitReq) | 48 | while (!QuitReq) |
49 | { | 49 | { |
50 | Application.RunIteration(); | 50 | Application.RunIteration(); |
51 | } | 51 | } |
@@ -57,15 +57,15 @@ namespace OpenGridServices.Manager | |||
57 | string cmd; | 57 | string cmd; |
58 | char[] sep = new char[1]; | 58 | char[] sep = new char[1]; |
59 | sep[0]=' '; | 59 | sep[0]=' '; |
60 | while(!QuitReq) | 60 | while (!QuitReq) |
61 | { | 61 | { |
62 | operation=PendingOperations.Dequeue(); | 62 | operation=PendingOperations.Dequeue(); |
63 | Console.WriteLine(operation); | 63 | Console.WriteLine(operation); |
64 | cmd = operation.Split(sep)[0]; | 64 | cmd = operation.Split(sep)[0]; |
65 | switch(cmd) { | 65 | switch (cmd) { |
66 | case "connect_to_gridserver": | 66 | case "connect_to_gridserver": |
67 | win.SetStatus("Connecting to grid server..."); | 67 | win.SetStatus("Connecting to grid server..."); |
68 | if(gridserverConn.Connect(operation.Split(sep)[1],operation.Split(sep)[2],operation.Split(sep)[3])) { | 68 | if (gridserverConn.Connect(operation.Split(sep)[1], operation.Split(sep)[2], operation.Split(sep)[3])) { |
69 | win.SetStatus("Connected OK with session ID:" + gridserverConn.SessionID); | 69 | win.SetStatus("Connected OK with session ID:" + gridserverConn.SessionID); |
70 | win.SetGridServerConnected(true); | 70 | win.SetGridServerConnected(true); |
71 | Thread.Sleep(3000); | 71 | Thread.Sleep(3000); |
@@ -78,7 +78,7 @@ namespace OpenGridServices.Manager | |||
78 | 78 | ||
79 | case "restart_gridserver": | 79 | case "restart_gridserver": |
80 | win.SetStatus("Restarting grid server..."); | 80 | win.SetStatus("Restarting grid server..."); |
81 | if(gridserverConn.RestartServer()) { | 81 | if (gridserverConn.RestartServer()) { |
82 | win.SetStatus("Restarted server OK"); | 82 | win.SetStatus("Restarted server OK"); |
83 | Thread.Sleep(3000); | 83 | Thread.Sleep(3000); |
84 | win.SetStatus(""); | 84 | win.SetStatus(""); |
@@ -89,7 +89,7 @@ namespace OpenGridServices.Manager | |||
89 | 89 | ||
90 | case "shutdown_gridserver": | 90 | case "shutdown_gridserver": |
91 | win.SetStatus("Shutting down grid server..."); | 91 | win.SetStatus("Shutting down grid server..."); |
92 | if(gridserverConn.ShutdownServer()) { | 92 | if (gridserverConn.ShutdownServer()) { |
93 | win.SetStatus("Grid server shutdown"); | 93 | win.SetStatus("Grid server shutdown"); |
94 | win.SetGridServerConnected(false); | 94 | win.SetGridServerConnected(false); |
95 | Thread.Sleep(3000); | 95 | Thread.Sleep(3000); |