diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs index 491a9a2..874f1a2 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | |||
@@ -82,14 +82,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
82 | IConfig assetConfig = source.Configs["UserAccountService"]; | 82 | IConfig assetConfig = source.Configs["UserAccountService"]; |
83 | if (assetConfig == null) | 83 | if (assetConfig == null) |
84 | { | 84 | { |
85 | m_log.Error("[ACCOUNT CONNECTOR]: UserAccountService missing from OpenSim.ini"); | 85 | m_log.Error("[SIMIAN ACCOUNT CONNECTOR]: UserAccountService missing from OpenSim.ini"); |
86 | throw new Exception("User account connector init error"); | 86 | throw new Exception("User account connector init error"); |
87 | } | 87 | } |
88 | 88 | ||
89 | string serviceURI = assetConfig.GetString("UserAccountServerURI"); | 89 | string serviceURI = assetConfig.GetString("UserAccountServerURI"); |
90 | if (String.IsNullOrEmpty(serviceURI)) | 90 | if (String.IsNullOrEmpty(serviceURI)) |
91 | { | 91 | { |
92 | m_log.Error("[ACCOUNT CONNECTOR]: No UserAccountServerURI in section UserAccountService, skipping SimianUserAccountServiceConnector"); | 92 | m_log.Error("[SIMIAN ACCOUNT CONNECTOR]: No UserAccountServerURI in section UserAccountService, skipping SimianUserAccountServiceConnector"); |
93 | throw new Exception("User account connector init error"); | 93 | throw new Exception("User account connector init error"); |
94 | } | 94 | } |
95 | 95 | ||
@@ -140,7 +140,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
140 | { | 140 | { |
141 | List<UserAccount> accounts = new List<UserAccount>(); | 141 | List<UserAccount> accounts = new List<UserAccount>(); |
142 | 142 | ||
143 | m_log.DebugFormat("[ACCOUNT CONNECTOR]: Searching for user accounts with name query " + query); | 143 | m_log.DebugFormat("[SIMIAN ACCOUNT CONNECTOR]: Searching for user accounts with name query " + query); |
144 | 144 | ||
145 | NameValueCollection requestArgs = new NameValueCollection | 145 | NameValueCollection requestArgs = new NameValueCollection |
146 | { | 146 | { |
@@ -163,12 +163,12 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
163 | } | 163 | } |
164 | else | 164 | else |
165 | { | 165 | { |
166 | m_log.Warn("[ACCOUNT CONNECTOR]: Account search failed, response data was in an invalid format"); | 166 | m_log.Warn("[SIMIAN ACCOUNT CONNECTOR]: Account search failed, response data was in an invalid format"); |
167 | } | 167 | } |
168 | } | 168 | } |
169 | else | 169 | else |
170 | { | 170 | { |
171 | m_log.Warn("[ACCOUNT CONNECTOR]: Failed to search for account data by name " + query); | 171 | m_log.Warn("[SIMIAN ACCOUNT CONNECTOR]: Failed to search for account data by name " + query); |
172 | } | 172 | } |
173 | 173 | ||
174 | return accounts; | 174 | return accounts; |
@@ -176,7 +176,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
176 | 176 | ||
177 | public bool StoreUserAccount(UserAccount data) | 177 | public bool StoreUserAccount(UserAccount data) |
178 | { | 178 | { |
179 | m_log.InfoFormat("[ACCOUNT CONNECTOR]: Storing user account for " + data.Name); | 179 | m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Storing user account for " + data.Name); |
180 | 180 | ||
181 | NameValueCollection requestArgs = new NameValueCollection | 181 | NameValueCollection requestArgs = new NameValueCollection |
182 | { | 182 | { |
@@ -191,7 +191,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
191 | 191 | ||
192 | if (response["Success"].AsBoolean()) | 192 | if (response["Success"].AsBoolean()) |
193 | { | 193 | { |
194 | m_log.InfoFormat("[ACCOUNT CONNECTOR]: Storing user account data for " + data.Name); | 194 | m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Storing user account data for " + data.Name); |
195 | 195 | ||
196 | requestArgs = new NameValueCollection | 196 | requestArgs = new NameValueCollection |
197 | { | 197 | { |
@@ -212,14 +212,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
212 | } | 212 | } |
213 | else | 213 | else |
214 | { | 214 | { |
215 | m_log.Warn("[ACCOUNT CONNECTOR]: Failed to store user account data for " + data.Name + ": " + response["Message"].AsString()); | 215 | m_log.Warn("[SIMIAN ACCOUNT CONNECTOR]: Failed to store user account data for " + data.Name + ": " + response["Message"].AsString()); |
216 | } | 216 | } |
217 | 217 | ||
218 | return success; | 218 | return success; |
219 | } | 219 | } |
220 | else | 220 | else |
221 | { | 221 | { |
222 | m_log.Warn("[ACCOUNT CONNECTOR]: Failed to store user account for " + data.Name + ": " + response["Message"].AsString()); | 222 | m_log.Warn("[SIMIAN ACCOUNT CONNECTOR]: Failed to store user account for " + data.Name + ": " + response["Message"].AsString()); |
223 | } | 223 | } |
224 | 224 | ||
225 | return false; | 225 | return false; |
@@ -233,7 +233,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
233 | private UserAccount GetUser(NameValueCollection requestArgs) | 233 | private UserAccount GetUser(NameValueCollection requestArgs) |
234 | { | 234 | { |
235 | string lookupValue = (requestArgs.Count > 1) ? requestArgs[1] : "(Unknown)"; | 235 | string lookupValue = (requestArgs.Count > 1) ? requestArgs[1] : "(Unknown)"; |
236 | m_log.DebugFormat("[ACCOUNT CONNECTOR]: Looking up user account with query: " + lookupValue); | 236 | m_log.DebugFormat("[SIMIAN ACCOUNT CONNECTOR]: Looking up user account with query: " + lookupValue); |
237 | 237 | ||
238 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 238 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); |
239 | if (response["Success"].AsBoolean()) | 239 | if (response["Success"].AsBoolean()) |
@@ -242,11 +242,11 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
242 | if (user != null) | 242 | if (user != null) |
243 | return ResponseToUserAccount(user); | 243 | return ResponseToUserAccount(user); |
244 | else | 244 | else |
245 | m_log.Warn("[ACCOUNT CONNECTOR]: Account search failed, response data was in an invalid format"); | 245 | m_log.Warn("[SIMIAN ACCOUNT CONNECTOR]: Account search failed, response data was in an invalid format"); |
246 | } | 246 | } |
247 | else | 247 | else |
248 | { | 248 | { |
249 | m_log.Warn("[ACCOUNT CONNECTOR]: Failed to lookup user account with query: " + lookupValue); | 249 | m_log.Warn("[SIMIAN ACCOUNT CONNECTOR]: Failed to lookup user account with query: " + lookupValue); |
250 | } | 250 | } |
251 | 251 | ||
252 | return null; | 252 | return null; |